loncom/lond - diff

Return to lond CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/lond between versions 1.489.2.21 and 1.527

version 1.489.2.21, 2016/08/11 16:37:54	version 1.527, 2016/09/20 23:50:09
Line 15	Line 15
#	#
# LON-CAPA is distributed in the hope that it will be useful,	# LON-CAPA is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of	# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.	# GNU General Public License for more details.
#	#
Line 41 use IO::File;	Line 40 use IO::File;
#use Apache::File;	#use Apache::File;
use POSIX;	use POSIX;
use Crypt::IDEA;	use Crypt::IDEA;
use LWP::UserAgent();	use HTTP::Request;
use Digest::MD5 qw(md5_hex);	use Digest::MD5 qw(md5_hex);
use GDBM_File;	use GDBM_File;
use Authen::Krb5;	use Authen::Krb5;
Line 58 use Mail::Send;	Line 57 use Mail::Send;
use Crypt::Eksblowfish::Bcrypt;	use Crypt::Eksblowfish::Bcrypt;
use Digest::SHA;	use Digest::SHA;
use Encode;	use Encode;
	use LONCAPA::LWPReq;

my $DEBUG = 0; # Non zero to enable debug log entries.	my $DEBUG = 0; # Non zero to enable debug log entries.

Line 74 my $clientip; # IP address of client.	Line 74 my $clientip; # IP address of client.
my $clientname; # LonCAPA name of client.	my $clientname; # LonCAPA name of client.
my $clientversion; # LonCAPA version running on client.	my $clientversion; # LonCAPA version running on client.
my $clienthomedom; # LonCAPA domain of homeID for client.	my $clienthomedom; # LonCAPA domain of homeID for client.
# primary library server.	my $clientintdom; # LonCAPA "internet domain" for client.
	my $clientsameinst; # LonCAPA "internet domain" same for
	# this host and client.
	my $clientremoteok; # Client allowed to host domain's users.
	# (version constraints ignored), not set
	# if this host and client share "internet domain".
	my %clientprohibited; # Actions prohibited on client;

my $server;	my $server;

my $keymode;	my $keymode;
Line 145 my @installerrors = ("ok",	Line 151 my @installerrors = ("ok",
);	);

#	#
	# The %trust hash classifies commands according to type of trust
	# required for execution of the command.
	#
	# When clients from a different institution request execution of a
	# particular command, the trust settings for that institution set
	# for this domain (or default domain for a multi-domain server) will
	# be checked to see if running the command is allowed.
	#
	# Trust types which depend on the "Trust" domain configuration
	# for the machine's default domain are:
	#
	# content ("Access to this domain's content by others")
	# shared ("Access to other domain's content by this domain")
	# enroll ("Enrollment in this domain's courses by others")
	# coaurem ("Co-author roles for this domain's users elsewhere")
	# domroles ("Domain roles in this domain assignable to others")
	# catalog ("Course Catalog for this domain displayed elsewhere")
	# reqcrs ("Requests for creation of courses in this domain by others")
	# msg ("Users in other domains can send messages to this domain")
	#
	# Trust type which depends on the User Session Hosting (remote)
	# domain configuration for machine's default domain is: "remote".
	#
	# Trust types which depend on contents of manager.tab in
	# /home/httpd/lonTabs is: "manageronly".
	#
	# Trust type which requires client to share the same LON-CAPA
	# "internet domain" (i.e., same institution as this server) is:
	# "institutiononly".
	#

	my %trust = (
	auth => {remote => 1},
	autocreatepassword => {remote => 1},
	autocrsreqchecks => {remote => 1, reqcrs => 1},
	autocrsrequpdate => {remote => 1},
	autocrsreqvalidation => {remote => 1},
	autogetsections => {remote => 1},
	autoinstcodedefaults => {remote => 1, catalog => 1},
	autoinstcodeformat => {remote => 1, catalog => 1},
	autonewcourse => {remote => 1, reqcrs => 1},
	autophotocheck => {remote => 1, enroll => 1},
	autophotochoice => {remote => 1},
	autophotopermission => {remote => 1, enroll => 1},
	autopossibleinstcodes => {remote => 1, reqcrs => 1},
	autoretrieve => {remote => 1, enroll => 1, catalog => 1},
	autorun => {remote => 1, enroll => 1, reqcrs => 1},
	autovalidateclass_sec => {catalog => 1},
	autovalidatecourse => {remote => 1, enroll => 1},
	autovalidateinstcode => {domroles => 1, remote => 1, enroll => 1},
	changeuserauth => {remote => 1, domroles => 1},
	chatretr => {remote => 1, enroll => 1},
	chatsend => {remote => 1, enroll => 1},
	courseiddump => {remote => 1, domroles => 1, enroll => 1},
	courseidput => {remote => 1, domroles => 1, enroll => 1},
	courseidputhash => {remote => 1, domroles => 1, enroll => 1},
	courselastaccess => {remote => 1, domroles => 1, enroll => 1},
	currentauth => {remote => 1, domroles => 1, enroll => 1},
	currentdump => {remote => 1, enroll => 1},
	currentversion => {remote=> 1, content => 1},
	dcmaildump => {remote => 1, domroles => 1},
	dcmailput => {remote => 1, domroles => 1},
	del => {remote => 1, domroles => 1, enroll => 1, content => 1},
	deldom => {remote => 1, domroles => 1}, # not currently used
	devalidatecache => {institutiononly => 1},
	domroleput => {remote => 1, enroll => 1},
	domrolesdump => {remote => 1, catalog => 1},
	du => {remote => 1, enroll => 1},
	du2 => {remote => 1, enroll => 1},
	dump => {remote => 1, enroll => 1, domroles => 1},
	edit => {institutiononly => 1}, #not used currently
	eget => {remote => 1, domroles => 1, enroll => 1}, #not used currently
	ekey => {}, #not used currently
	exit => {anywhere => 1},
	fetchuserfile => {remote => 1, enroll => 1},
	get => {remote => 1, domroles => 1, enroll => 1},
	getdom => {anywhere => 1},
	home => {anywhere => 1},
	iddel => {remote => 1, enroll => 1},
	idget => {remote => 1, enroll => 1},
	idput => {remote => 1, domroles => 1, enroll => 1},
	inc => {remote => 1, enroll => 1},
	init => {anywhere => 1},
	inst_usertypes => {remote => 1, domroles => 1, enroll => 1},
	instemailrules => {remote => 1, domroles => 1},
	instidrulecheck => {remote => 1, domroles => 1,},
	instidrules => {remote => 1, domroles => 1,},
	instrulecheck => {remote => 1, enroll => 1, reqcrs => 1, domroles => 1},
	instselfcreatecheck => {institutiononly => 1},
	instuserrules => {remote => 1, enroll => 1, reqcrs => 1, domroles => 1},
	keys => {remote => 1,},
	load => {anywhere => 1},
	log => {anywhere => 1},
	ls => {remote => 1, enroll => 1, content => 1,},
	ls2 => {remote => 1, enroll => 1, content => 1,},
	ls3 => {remote => 1, enroll => 1, content => 1,},
	makeuser => {remote => 1, enroll => 1, domroles => 1,},
	mkdiruserfile => {remote => 1, enroll => 1,},
	newput => {remote => 1, enroll => 1, reqcrs => 1, domroles => 1,},
	passwd => {remote => 1},
	ping => {anywhere => 1},
	pong => {anywhere => 1},
	pushfile => {manageronly => 1},
	put => {remote => 1, enroll => 1, domroles => 1, msg => 1, content => 1, shared => 1},
	putdom => {remote => 1, domroles => 1,},
	putstore => {remote => 1, enroll => 1},
	queryreply => {anywhere => 1},
	querysend => {anywhere => 1},
	quit => {anywhere => 1},
	readlonnetglobal => {institutiononly => 1},
	reinit => {manageronly => 1}, #not used currently
	removeuserfile => {remote => 1, enroll => 1},
	renameuserfile => {remote => 1,},
	restore => {remote => 1, enroll => 1, reqcrs => 1,},
	rolesdel => {remote => 1, enroll => 1, domroles => 1, coaurem => 1},
	rolesput => {remote => 1, enroll => 1, domroles => 1, coaurem => 1},
	serverdistarch => {manageronly => 1},
	servercerts => {institutiononly => 1},
	serverhomeID => {anywhere => 1},
	serverloncaparev => {anywhere => 1},
	servertimezone => {remote => 1, enroll => 1},
	setannounce => {remote => 1, domroles => 1},
	sethost => {anywhere => 1},
	store => {remote => 1, enroll => 1, reqcrs => 1,},
	studentphoto => {remote => 1, enroll => 1},
	sub => {content => 1,},
	tmpdel => {anywhere => 1},
	tmpget => {anywhere => 1},
	tmpput => {anywhere => 1},
	tokenauthuserfile => {anywhere => 1},
	unsub => {content => 1,},
	update => {shared => 1},
	updateclickers => {remote => 1},
	userhassession => {anywhere => 1},
	userload => {anywhere => 1},
	version => {anywhere => 1}, #not used
	);

	#
# Statistics that are maintained and dislayed in the status line.	# Statistics that are maintained and dislayed in the status line.
#	#
my $Transactions = 0; # Number of attempted transactions.	my $Transactions = 0; # Number of attempted transactions.
Line 667 sub PushFile {	Line 812 sub PushFile {
$clientprotocol = 'http' if ($clientprotocol ne 'https');	$clientprotocol = 'http' if ($clientprotocol ne 'https');
my $url = '/adm/'.$filename;	my $url = '/adm/'.$filename;
$url =~ s{_}{/};	$url =~ s{_}{/};
my $ua=new LWP::UserAgent;
$ua->timeout(60);
my $request=new HTTP::Request('GET',"$clientprotocol://$clienthost$url");	my $request=new HTTP::Request('GET',"$clientprotocol://$clienthost$url");
my $response=$ua->request($request);	my $response = LONCAPA::LWPReq::makerequest($clientname,$request,'',\%perlvar,60,0);
if ($response->is_error()) {	if ($response->is_error()) {
&logthis('<font color="red"> Pushfile: unable to install '	&logthis('<font color="red"> Pushfile: unable to install '
.$tablefile." - error attempting to pull data. </font>");	.$tablefile." - error attempting to pull data. </font>");
Line 1797 sub server_distarch_handler {	Line 1940 sub server_distarch_handler {
}	}
&register_handler("serverdistarch", \&server_distarch_handler, 0, 1, 0);	&register_handler("serverdistarch", \&server_distarch_handler, 0, 1, 0);

	sub server_certs_handler {
	my ($cmd,$tail,$client) = @_;
	my $userinput = "$cmd:$tail";
	my $result;
	my $result = &LONCAPA::Lond::server_certs(\%perlvar);
	&Reply($client,\$result,$userinput);
	return;
	}
	&register_handler("servercerts", \&server_certs_handler, 0, 1, 0);

# Process a reinit request. Reinit requests that either	# Process a reinit request. Reinit requests that either
# lonc or lond be reinitialized so that an updated	# lonc or lond be reinitialized so that an updated
# host.tab or domain.tab can be processed.	# host.tab or domain.tab can be processed.
Line 1929 sub authenticate_handler {	Line 2082 sub authenticate_handler {
my ($remote,$hosted);	my ($remote,$hosted);
my $remotesession = &get_usersession_config($udom,'remotesession');	my $remotesession = &get_usersession_config($udom,'remotesession');
if (ref($remotesession) eq 'HASH') {	if (ref($remotesession) eq 'HASH') {
$remote = $remotesession->{'remote'}	$remote = $remotesession->{'remote'};
}	}
my $hostedsession = &get_usersession_config($clienthomedom,'hostedsession');	my $hostedsession = &get_usersession_config($clienthomedom,'hostedsession');
if (ref($hostedsession) eq 'HASH') {	if (ref($hostedsession) eq 'HASH') {
$hosted = $hostedsession->{'hosted'};	$hosted = $hostedsession->{'hosted'};
}	}
my $loncaparev = $clientversion;
if ($loncaparev eq '') {
$loncaparev = $Apache::lonnet::loncaparevs{$clientname};
}
$canhost = &Apache::lonnet::can_host_session($udom,$clientname,	$canhost = &Apache::lonnet::can_host_session($udom,$clientname,
$loncaparev,	$clientversion,
$remote,$hosted);	$remote,$hosted);
}	}
}	}
Line 2038 sub change_password_handler {	Line 2187 sub change_password_handler {
my $result = &change_unix_password($uname, $npass);	my $result = &change_unix_password($uname, $npass);
if ($result eq 'ok') {	if ($result eq 'ok') {
&update_passwd_history($uname,$udom,$howpwd,$context);	&update_passwd_history($uname,$udom,$howpwd,$context);
}	}
&logthis("Result of password change for $uname: ".	&logthis("Result of password change for $uname: ".
$result);	$result);
&Reply($client, \$result, $userinput);	&Reply($client, \$result, $userinput);
Line 2210 sub change_authentication_handler {	Line 2359 sub change_authentication_handler {
my $result = &change_unix_password($uname, $npass);	my $result = &change_unix_password($uname, $npass);
&logthis("Result of password change for $uname: ".$result);	&logthis("Result of password change for $uname: ".$result);
if ($result eq "ok") {	if ($result eq "ok") {
&update_passwd_history($uname,$udom,$umode,'changeuserauth');	&update_passwd_history($uname,$udom,$umode,'changeuserauth');
&Reply($client, \$result);	&Reply($client, \$result);
} else {	} else {
&Failure($client, \$result);	&Failure($client, \$result);
Line 2335 sub update_resource_handler {	Line 2484 sub update_resource_handler {
# FIXME: this should use the LWP mechanism, not internal alarms.	# FIXME: this should use the LWP mechanism, not internal alarms.
alarm(1200);	alarm(1200);
{	{
my $ua=new LWP::UserAgent;
my $request=new HTTP::Request('GET',"$remoteurl");	my $request=new HTTP::Request('GET',"$remoteurl");
$response=$ua->request($request,$transname);	$response=&LONCAPA::LWPReq::makerequest($clientname,$request,$transname,\%perlvar,1200,0,1);
}	}
alarm(0);	alarm(0);
if ($response->is_error()) {	if ($response->is_error()) {
Line 2350 sub update_resource_handler {	Line 2498 sub update_resource_handler {
# FIXME: isn't there an internal LWP mechanism for this?	# FIXME: isn't there an internal LWP mechanism for this?
alarm(120);	alarm(120);
{	{
my $ua=new LWP::UserAgent;
my $mrequest=new HTTP::Request('GET',$remoteurl.'.meta');	my $mrequest=new HTTP::Request('GET',$remoteurl.'.meta');
my $mresponse=$ua->request($mrequest,$fname.'.meta');	my $mresponse = &LONCAPA::LWPReq::makerequest($clientname,$mrequest,$fname.'.meta',\%perlvar,120,0,1);
if ($mresponse->is_error()) {	if ($mresponse->is_error()) {
unlink($fname.'.meta');	unlink($fname.'.meta');
}	}
Line 2427 sub fetch_user_file_handler {	Line 2574 sub fetch_user_file_handler {
my $remoteurl=$clientprotocol.'://'.$clienthost.'/userfiles/'.$fname;	my $remoteurl=$clientprotocol.'://'.$clienthost.'/userfiles/'.$fname;
my $response;	my $response;
Debug("Remote URL : $remoteurl Transfername $transname Destname: $destname");	Debug("Remote URL : $remoteurl Transfername $transname Destname: $destname");
alarm(120);	alarm(1200);
{	{
my $ua=new LWP::UserAgent;
my $request=new HTTP::Request('GET',"$remoteurl");	my $request=new HTTP::Request('GET',"$remoteurl");
$response=$ua->request($request,$transname);	my $verifycert = 1;
	my @machine_ids = &Apache::lonnet::current_machine_ids();
	if (grep(/^\Q$clientname\E$/,@machine_ids)) {
	$verifycert = 0;
	}
	$response = &LONCAPA::LWPReq::makerequest($clientname,$request,$transname,\%perlvar,1200,$verifycert);
}	}
alarm(0);	alarm(0);
if ($response->is_error()) {	if ($response->is_error()) {
Line 2500 sub remove_user_file_handler {	Line 2651 sub remove_user_file_handler {
if (-e $file) {	if (-e $file) {
#	#
# If the file is a regular file unlink is fine...	# If the file is a regular file unlink is fine...
# However it's possible the client wants a dir	# However it's possible the client wants a dir
# removed, in which case rmdir is more appropriate	# removed, in which case rmdir is more appropriate.
# Note: rmdir will only remove an empty directory.	# Note: rmdir will only remove an empty directory.
#	#
if (-f $file){	if (-f $file){
unlink($file);	unlink($file);
# for html files remove the associated .bak file	# for html files remove the associated .bak file
# which may have been created by the editor.	# which may have been created by the editor.
if ($ufile =~ m{^((docs\|supplemental)/(?:\d+\|default)/\d+(?:\|/.+)/)[^/]+\.x?html?$}i) {	if ($ufile =~ m{^((docs\|supplemental)/(?:\d+\|default)/\d+(?:\|/.+)/)[^/]+\.x?html?$}i) {
my $path = $1;	my $path = $1;
Line 2880 sub newput_user_profile_entry {	Line 3031 sub newput_user_profile_entry {
&logthis("error: ".($!+0)." untie (GDBM) failed ".	&logthis("error: ".($!+0)." untie (GDBM) failed ".
"while attempting newput - early out as key exists");	"while attempting newput - early out as key exists");
}	}
&Failure($client, "key_exists: ".$key."\n",$userinput);	&Failure($client, "key_exists: ".$key."\n",$userinput);
return 1;	return 1;
}	}
}	}

Line 3283 sub get_profile_keys {	Line 3434 sub get_profile_keys {
sub dump_profile_database {	sub dump_profile_database {
my ($cmd, $tail, $client) = @_;	my ($cmd, $tail, $client) = @_;

	my $res = LONCAPA::Lond::dump_profile_database($tail);

	if ($res =~ /^error:/) {
	Failure($client, \$res, "$cmd:$tail");
	} else {
	Reply($client, \$res, "$cmd:$tail");
	}

	return 1;

	#TODO remove
my $userinput = "$cmd:$tail";	my $userinput = "$cmd:$tail";

my ($udom,$uname,$namespace) = split(/:/,$tail);	my ($udom,$uname,$namespace) = split(/:/,$tail);
Line 3362 sub dump_with_regexp {	Line 3524 sub dump_with_regexp {
my ($cmd, $tail, $client) = @_;	my ($cmd, $tail, $client) = @_;

my $res = LONCAPA::Lond::dump_with_regexp($tail, $clientversion);	my $res = LONCAPA::Lond::dump_with_regexp($tail, $clientversion);

if ($res =~ /^error:/) {	if ($res =~ /^error:/) {
&Failure($client, \$res, "$cmd:$tail");	Failure($client, \$res, "$cmd:$tail");
} else {	} else {
&Reply($client, \$res, "$cmd:$tail");	Reply($client, \$res, "$cmd:$tail");
}	}

return 1;	return 1;
Line 3404 sub store_handler {	Line 3566 sub store_handler {
my ($cmd, $tail, $client) = @_;	my ($cmd, $tail, $client) = @_;

my $userinput = "$cmd:$tail";	my $userinput = "$cmd:$tail";

chomp($tail);	chomp($tail);
my ($udom,$uname,$namespace,$rid,$what,$laststore) =split(/:/,$tail);	my ($udom,$uname,$namespace,$rid,$what,$laststore) =split(/:/,$tail);
if ($namespace ne 'roles') {	if ($namespace ne 'roles') {
Line 3434 sub store_handler {	Line 3595 sub store_handler {
$numtrans =~ s/D//g;	$numtrans =~ s/D//g;
}	}
}	}

$hashref->{"version:$rid"}++;	$hashref->{"version:$rid"}++;
my $version=$hashref->{"version:$rid"};	my $version=$hashref->{"version:$rid"};
my $allkeys='';	my $allkeys='';
Line 3451 sub store_handler {	Line 3611 sub store_handler {
if ($numtrans) {	if ($numtrans) {
$msg = 'delay:'.$numtrans;	$msg = 'delay:'.$numtrans;
}	}
&Reply($client, "$msg\n", $userinput);	&Reply($client, "$msg\n", $userinput);
} else {	} else {
&Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".	&Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
"while attempting store\n", $userinput);	"while attempting store\n", $userinput);
Line 3968 sub put_course_id_hash_handler {	Line 4128 sub put_course_id_hash_handler {
#	#
# domcloner - flag to indicate if user can create CCs in course's domain.	# domcloner - flag to indicate if user can create CCs in course's domain.
# If so, ability to clone course is automatic.	# If so, ability to clone course is automatic.
# hasuniquecode - filter by courses for which a six character unique code has	# hasuniquecode - filter by courses for which a six character unique code has
# been set.	# been set.
#	#
# $client - The socket open on the client.	# $client - The socket open on the client.
Line 3978 sub put_course_id_hash_handler {	Line 4138 sub put_course_id_hash_handler {
# a reply is written to $client.	# a reply is written to $client.
sub dump_course_id_handler {	sub dump_course_id_handler {
my ($cmd, $tail, $client) = @_;	my ($cmd, $tail, $client) = @_;

	my $res = LONCAPA::Lond::dump_course_id_handler($tail);
	if ($res =~ /^error:/) {
	Failure($client, \$res, "$cmd:$tail");
	} else {
	Reply($client, \$res, "$cmd:$tail");
	}

	return 1;

	#TODO remove
my $userinput = "$cmd:$tail";	my $userinput = "$cmd:$tail";

my ($udom,$since,$description,$instcodefilter,$ownerfilter,$coursefilter,	my ($udom,$since,$description,$instcodefilter,$ownerfilter,$coursefilter,
Line 4425 sub put_domain_handler {	Line 4596 sub put_domain_handler {
}	}
&register_handler("putdom", \&put_domain_handler, 0, 1, 0);	&register_handler("putdom", \&put_domain_handler, 0, 1, 0);

	# Updates one or more entries in clickers.db file at the domain level
	#
	# Parameters:
	# $cmd - The command that got us here.
	# $tail - Tail of the command (remaining parameters).
	# In this case a colon separated list containing:
	# (a) the domain for which we are updating the entries,
	# (b) the action required -- add or del -- and
	# (c) a &-separated list of entries to add or delete.
	# $client - File descriptor connected to client.
	# Returns
	# 1 - Continue processing.
	# 0 - Requested to exit, caller should shut down.
	# Side effects:
	# reply is written to $client.
	#


	sub update_clickers {
	my ($cmd, $tail, $client) = @_;

	my $userinput = "$cmd:$tail";
	my ($udom,$action,$what) =split(/:/,$tail,3);
	chomp($what);

	my $hashref = &tie_domain_hash($udom, "clickers", &GDBM_WRCREAT(),
	"U","$action:$what");

	if (!$hashref) {
	&Failure( $client, "error: ".($!+0)." tie(GDBM) Failed ".
	"while attempting updateclickers\n", $userinput);
	return 1;
	}

	my @pairs=split(/\&/,$what);
	foreach my $pair (@pairs) {
	my ($key,$value)=split(/=/,$pair);
	if ($action eq 'add') {
	if (exists($hashref->{$key})) {
	my @newvals = split(/,/,&unescape($value));
	my @currvals = split(/,/,&unescape($hashref->{$key}));
	my @merged = sort(keys(%{{map { $_ => 1 } (@newvals,@currvals)}}));
	$hashref->{$key}=&escape(join(',',@merged));
	} else {
	$hashref->{$key}=$value;
	}
	} elsif ($action eq 'del') {
	if (exists($hashref->{$key})) {
	my %current;
	map { $current{$_} = 1; } split(/,/,&unescape($hashref->{$key}));
	map { delete($current{$_}); } split(/,/,&unescape($value));
	if (keys(%current)) {
	$hashref->{$key}=&escape(join(',',sort(keys(%current))));
	} else {
	delete($hashref->{$key});
	}
	}
	}
	}
	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;
	}
	&register_handler("updateclickers", \&update_clickers, 0, 1, 0);


	# Deletes one or more entries in a namespace db file at the domain level
	#
	# Parameters:
	# $cmd - The command that got us here.
	# $tail - Tail of the command (remaining parameters).
	# In this case a colon separated list containing:
	# (a) the domain for which we are deleting the entries,
	# (b) &-separated list of keys to delete.
	# $client - File descriptor connected to client.
	# Returns
	# 1 - Continue processing.
	# 0 - Requested to exit, caller should shut down.
	# Side effects:
	# reply is written to $client.
	#

	sub del_domain_handler {
	my ($cmd,$tail,$client) = @_;

	my $userinput = "$cmd:$tail";

	my ($udom,$namespace,$what)=split(/:/,$tail,3);
	chomp($what);
	my $hashref = &tie_domain_hash($udom,$namespace,&GDBM_WRCREAT(),
	"D", $what);
	if ($hashref) {
	my @keys=split(/\&/,$what);
	foreach my $key (@keys) {
	delete($hashref->{$key});
	}
	if (&untie_user_hash($hashref)) {
	&Reply($client, "ok\n", $userinput);
	} else {
	&Failure($client, "error: ".($!+0)." untie(GDBM) Failed ".
	"while attempting deldom\n", $userinput);
	}
	} else {
	&Failure( $client, "error: ".($!+0)." tie(GDBM) Failed ".
	"while attempting deldom\n", $userinput);
	}
	return 1;
	}
	&register_handler("deldom", \&del_domain_handler, 0, 1, 0);


# Unencrypted get from the namespace database file at the domain level.	# Unencrypted get from the namespace database file at the domain level.
# This function retrieves a keyed item from a specific named database in the	# This function retrieves a keyed item from a specific named database in the
# domain directory.	# domain directory.
Line 4584 sub get_id_handler {	Line 4871 sub get_id_handler {
# Returns:	# Returns:
# 1 - Continue processing	# 1 - Continue processing
# 0 - Exit server.	# 0 - Exit server.
#	#
#	#

sub del_id_handler {	sub del_id_handler {
Line 5330 sub create_auto_enroll_password_handler	Line 5617 sub create_auto_enroll_password_handler
&register_handler("autocreatepassword", \&create_auto_enroll_password_handler,	&register_handler("autocreatepassword", \&create_auto_enroll_password_handler,
0, 1, 0);	0, 1, 0);

	sub auto_export_grades_handler {
	my ($cmd, $tail, $client) = @_;
	my $userinput = "$cmd:$tail";
	my ($cdom,$cnum,$info,$data) = split(/:/,$tail);
	my $inforef = &Apache::lonnet::thaw_unescape($info);
	my $dataref = &Apache::lonnet::thaw_unescape($data);
	my ($outcome,$result);;
	eval {
	local($SIG{__DIE__})='DEFAULT';
	my %rtnhash;
	$outcome=&localenroll::export_grades($cdom,$cnum,$inforef,$dataref,\%rtnhash);
	if ($outcome eq 'ok') {
	foreach my $key (keys(%rtnhash)) {
	$result .= &escape($key).'='.&Apache::lonnet::freeze_escape($rtnhash{$key}).'&';
	}
	$result =~ s/\&$//;
	}
	};
	if (!$@) {
	if ($outcome eq 'ok') {
	if ($cipher) {
	my $cmdlength=length($result);
	$result.=" ";
	my $encresult='';
	for (my $encidx=0;$encidx<=$cmdlength;$encidx+=8) {
	$encresult.= unpack("H16",
	$cipher->encrypt(substr($result,
	$encidx,
	8)));
	}
	&Reply( $client, "enc:$cmdlength:$encresult\n", $userinput);
	} else {
	&Failure( $client, "error:no_key\n", $userinput);
	}
	} else {
	&Reply($client, "$outcome\n", $userinput);
	}
	} else {
	&Failure($client,"export_error\n",$userinput);
	}
	return 1;
	}
	&register_handler("autoexportgrades", \&auto_export_grades_handler,
	0, 1, 0);

# Retrieve and remove temporary files created by/during autoenrollment.	# Retrieve and remove temporary files created by/during autoenrollment.
#	#
# Formal Parameters:	# Formal Parameters:
# $cmd - The command that got us dispatched.	# $cmd - The command that got us dispatched.
# $tail - The tail of the command. In our case this is a colon	# $tail - The tail of the command. In our case this is a colon
# separated list that will be split into:	# separated list that will be split into:
# $filename - The name of the file to remove.	# $filename - The name of the file to retrieve.
# The filename is given as a path relative to	# The filename is given as a path relative to
# the LonCAPA temp file directory.	# the LonCAPA temp file directory.
# $client - Socket open on the client.	# $client - Socket open on the client.
Line 5350 sub retrieve_auto_file_handler {	Line 5682 sub retrieve_auto_file_handler {
my ($filename) = split(/:/, $tail);	my ($filename) = split(/:/, $tail);

my $source = $perlvar{'lonDaemons'}.'/tmp/'.$filename;	my $source = $perlvar{'lonDaemons'}.'/tmp/'.$filename;

if ($filename =~m{/\.\./}) {	if ($filename =~m{/\.\./}) {
&Failure($client, "refused\n", $userinput);	&Failure($client, "refused\n", $userinput);
	} elsif ($filename !~ /^$LONCAPA::match_domain\_$LONCAPA::match_courseid\_.+_classlist\.xml$/) {
	&Failure($client, "refused\n", $userinput);
} elsif ( (-e $source) && ($filename ne '') ) {	} elsif ( (-e $source) && ($filename ne '') ) {
my $reply = '';	my $reply = '';
if (open(my $fh,$source)) {	if (open(my $fh,$source)) {
Line 5384 sub crsreq_checks_handler {	Line 5719 sub crsreq_checks_handler {
my $userinput = "$cmd:$tail";	my $userinput = "$cmd:$tail";
my $dom = $tail;	my $dom = $tail;
my $result;	my $result;
my @reqtypes = ('official','unofficial','community','textbook');	my @reqtypes = ('official','unofficial','community','textbook','placement');
eval {	eval {
local($SIG{__DIE__})='DEFAULT';	local($SIG{__DIE__})='DEFAULT';
my %validations;	my %validations;
Line 5989 sub get_request {	Line 6324 sub get_request {
#	#
# Parameters:	# Parameters:
# user_input - The request received from the client (lonc).	# user_input - The request received from the client (lonc).
	#
# Returns:	# Returns:
# true to keep processing, false if caller should exit.	# true to keep processing, false if caller should exit.
#	#
sub process_request {	sub process_request {
my ($userinput) = @_; # Easier for now to break style than to	my ($userinput) = @_; # Easier for now to break style than to
# fix all the userinput -> user_input.	# fix all the userinput -> user_input.
my $wasenc = 0; # True if request was encrypted.	my $wasenc = 0; # True if request was encrypted.
# ------------------------------------------------------------ See if encrypted	# ------------------------------------------------------------ See if encrypted
# for command	# for command
Line 6074 sub process_request {	Line 6410 sub process_request {
Debug("Client not privileged to do this operation");	Debug("Client not privileged to do this operation");
$ok = 0;	$ok = 0;
}	}
	if ($ok) {
	if (ref($trust{$command}) eq 'HASH') {
	my $donechecks;
	if ($trust{$command}{'anywhere'}) {
	$donechecks = 1;
	} elsif ($trust{$command}{'manageronly'}) {
	unless (&isManager()) {
	$ok = 0;
	}
	$donechecks = 1;
	} elsif ($trust{$command}{'institutiononly'}) {
	unless ($clientsameinst) {
	$ok = 0;
	}
	$donechecks = 1;
	} elsif ($clientsameinst) {
	$donechecks = 1;
	}
	unless ($donechecks) {
	foreach my $rule (keys(%{$trust{$command}})) {
	next if ($rule eq 'remote');
	if ($trust{$command}{$rule}) {
	if ($clientprohibited{$rule}) {
	$ok = 0;
	} else {
	$ok = 1;
	$donechecks = 1;
	last;
	}
	}
	}
	}
	unless ($donechecks) {
	if ($trust{$command}{'remote'}) {
	if ($clientremoteok) {
	$ok = 1;
	} else {
	$ok = 0;
	}
	}
	}
	}
	}

if($ok) {	if($ok) {
Debug("Dispatching to handler $command $tail");	Debug("Dispatching to handler $command $tail");
Line 6084 sub process_request {	Line 6463 sub process_request {
Failure($client, "refused\n", $userinput);	Failure($client, "refused\n", $userinput);
return 1;	return 1;
}	}
	}
}

print $client "unknown_cmd\n";	print $client "unknown_cmd\n";
# -------------------------------------------------------------------- complete	# -------------------------------------------------------------------- complete
Line 6429 sub Debug {	Line 6807 sub Debug {
# reply - Text to send to client.	# reply - Text to send to client.
# request - Original request from client.	# request - Original request from client.
#	#
	#NOTE $reply must be terminated by exactly one \n. If $reply is a reference
	#this is done automatically ($$reply must not contain any \n in this case).
	#If $reply is a string the caller has to ensure this.
sub Reply {	sub Reply {
my ($fd, $reply, $request) = @_;	my ($fd, $reply, $request) = @_;
if (ref($reply)) {	if (ref($reply)) {
Line 6682 sub make_new_child {	Line 7063 sub make_new_child {
}	}
} elsif ($dist =~ /^suse(\d+\.\d+)$/) {	} elsif ($dist =~ /^suse(\d+\.\d+)$/) {
if (($1 eq '9.3') \|\| ($1 >= 12.2)) {	if (($1 eq '9.3') \|\| ($1 >= 12.2)) {
$no_ets = 1;	$no_ets = 1;
}	}
} elsif ($dist =~ /^sles(\d+)$/) {	} elsif ($dist =~ /^sles(\d+)$/) {
if ($1 > 11) {	if ($1 > 11) {
Line 6694 sub make_new_child {	Line 7075 sub make_new_child {
}	}
}	}
unless ($no_ets) {	unless ($no_ets) {
&Authen::Krb5::init_ets();	&Authen::Krb5::init_ets();
}	}

&status('Accepted connection');	&status('Accepted connection');
# =============================================================================	# =============================================================================
Line 6739 sub make_new_child {	Line 7120 sub make_new_child {
# If the remote is attempting a local init... give that a try:	# If the remote is attempting a local init... give that a try:
#	#
(my $i, my $inittype, $clientversion) = split(/:/, $remotereq);	(my $i, my $inittype, $clientversion) = split(/:/, $remotereq);
# For LON-CAPA 2.9, the client session will have sent its LON-CAPA	# For LON-CAPA 2.9, the client session will have sent its LON-CAPA
# version when initiating the connection. For LON-CAPA 2.8 and older,	# version when initiating the connection. For LON-CAPA 2.8 and older,
# the version is retrieved from the global %loncaparevs in lonnet.pm.	# the version is retrieved from the global %loncaparevs in lonnet.pm.
# $clientversion contains path to keyfile if $inittype eq 'local'	# $clientversion contains path to keyfile if $inittype eq 'local'
# it's overridden below in this case	# it's overridden below in this case
$clientversion \|\|= $Apache::lonnet::loncaparevs{$clientname};	$clientversion \|\|= $Apache::lonnet::loncaparevs{$clientname};

# If the connection type is ssl, but I didn't get my	# If the connection type is ssl, but I didn't get my
# certificate files yet, then I'll drop back to	# certificate files yet, then I'll drop back to
Line 6839 sub make_new_child {	Line 7220 sub make_new_child {
my $clienthost = &Apache::lonnet::hostname($clientname);	my $clienthost = &Apache::lonnet::hostname($clientname);
my $clientserverhomeID = &Apache::lonnet::get_server_homeID($clienthost);	my $clientserverhomeID = &Apache::lonnet::get_server_homeID($clienthost);
$clienthomedom = &Apache::lonnet::host_domain($clientserverhomeID);	$clienthomedom = &Apache::lonnet::host_domain($clientserverhomeID);
	$clientintdom = &Apache::lonnet::internet_dom($clientserverhomeID);
	$clientsameinst = 0;
	if ($clientintdom ne '') {
	my $internet_names = &Apache::lonnet::get_internet_names($currenthostid);
	if (ref($internet_names) eq 'ARRAY') {
	if (grep(/^\Q$clientintdom\E$/,@{$internet_names})) {
	$clientsameinst = 1;
	}
	}
	}
	$clientremoteok = 0;
	unless ($clientsameinst) {
	$clientremoteok = 1;
	my $defdom = &Apache::lonnet::host_domain($perlvar{'lonHostID'});
	%clientprohibited = &get_prohibited($defdom);
	if ($clientintdom) {
	my $remsessconf = &get_usersession_config($defdom,'remotesession');
	if (ref($remsessconf) eq 'HASH') {
	if (ref($remsessconf->{'remote'}) eq 'HASH') {
	if (ref($remsessconf->{'remote'}->{'excludedomain'}) eq 'ARRAY') {
	if (grep(/^\Q$clientintdom\E$/,@{$remsessconf->{'remote'}->{'excludedomain'}})) {
	$clientremoteok = 0;
	}
	}
	if (ref($remsessconf->{'remote'}->{'includedomain'}) eq 'ARRAY') {
	if (grep(/^\Q$clientintdom\E$/,@{$remsessconf->{'remote'}->{'includedomain'}})) {
	$clientremoteok = 1;
	} else {
	$clientremoteok = 0;
	}
	}
	}
	}
	}
	}
while(($user_input = get_request) && $keep_going) {	while(($user_input = get_request) && $keep_going) {
alarm(120);	alarm(120);
Debug("Main: Got $user_input\n");	Debug("Main: Got $user_input\n");
Line 6854 sub make_new_child {	Line 7270 sub make_new_child {
&logthis("<font color='blue'>WARNING: "	&logthis("<font color='blue'>WARNING: "
."Rejected client $clientip, closing connection</font>");	."Rejected client $clientip, closing connection</font>");
}	}
}	}

# =============================================================================	# =============================================================================

Line 7523 sub make_passwd_file {	Line 7939 sub make_passwd_file {
&Debug("Creating internal auth");	&Debug("Creating internal auth");
my $pf = IO::File->new(">$passfilename");	my $pf = IO::File->new(">$passfilename");
if($pf) {	if($pf) {
print $pf "internal:$ncpass\n";	print $pf "internal:$ncpass\n";
&update_passwd_history($uname,$udom,$umode,$action);	&update_passwd_history($uname,$udom,$umode,$action);
} else {	} else {
$result = "pass_file_failed_error";	$result = "pass_file_failed_error";
}	}
Line 7597 sub get_usersession_config {	Line 8013 sub get_usersession_config {
return $usersessionconf;	return $usersessionconf;
} else {	} else {
my %domconfig = &Apache::lonnet::get_dom('configuration',['usersessions'],$dom);	my %domconfig = &Apache::lonnet::get_dom('configuration',['usersessions'],$dom);
if (ref($domconfig{'usersessions'}) eq 'HASH') {	&Apache::lonnet::do_cache_new($name,$dom,$domconfig{'usersessions'},3600);
&Apache::lonnet::do_cache_new($name,$dom,$domconfig{'usersessions'},3600);	return $domconfig{'usersessions'};
return $domconfig{'usersessions'};
}
}	}
return;	return;
}	}

	sub get_prohibited {
	my ($dom) = @_;
	my $name = 'trust';
	my ($trustconfig,$cached)=&Apache::lonnet::is_cached_new($name,$dom);
	unless (defined($cached)) {
	my %domconfig = &Apache::lonnet::get_dom('configuration',['trust'],$dom);
	&Apache::lonnet::do_cache_new($name,$dom,$domconfig{'trust'},3600);
	$trustconfig = $domconfig{'trust'};
	}
	my %prohibited;
	if (ref($trustconfig)) {
	foreach my $prefix (keys(%{$trustconfig})) {
	if (ref($trustconfig->{$prefix}) eq 'HASH') {
	my $reject;
	if (ref($trustconfig->{$prefix}->{'exc'}) eq 'ARRAY') {
	if (grep(/^\Q$clientintdom\E$/,@{$trustconfig->{$prefix}->{'exc'}})) {
	$reject = 1;
	}
	}
	if (ref($trustconfig->{$prefix}->{'inc'}) eq 'ARRAY') {
	if (grep(/^\Q$clientintdom\E$/,@{$trustconfig->{$prefix}->{'inc'}})) {
	$reject = 0;
	} else {
	$reject = 1;
	}
	}
	if ($reject) {
	$prohibited{$prefix} = 1;
	}
	}
	}
	}
	return %prohibited;
	}

sub distro_and_arch {	sub distro_and_arch {
return $dist.':'.$arch;	return $dist.':'.$arch;
Line 7789 Allow for a password to be set.	Line 8237 Allow for a password to be set.

Make a user.	Make a user.

=item passwd	=item changeuserauth

Allow for authentication mechanism and password to be changed.	Allow for authentication mechanism and password to be changed.

Line 7878 for each student, defined perhaps by the	Line 8326 for each student, defined perhaps by the
Returns usernames corresponding to IDs. (These "IDs" are unique identifiers	Returns usernames corresponding to IDs. (These "IDs" are unique identifiers
for each student, defined perhaps by the institutional Registrar.)	for each student, defined perhaps by the institutional Registrar.)

	=item iddel

	Deletes one or more ids in a domain's id database.

=item tmpput	=item tmpput

Accept and store information in temporary space.	Accept and store information in temporary space.
Line 7934 Authen::Krb5	Line 8386 Authen::Krb5

=head1 COREQUISITES	=head1 COREQUISITES

	none

=head1 OSNAMES	=head1 OSNAMES

linux	linux
Line 8021 or the CA's certificate in the call to l	Line 8475 or the CA's certificate in the call to l
<error> is the textual reason this failed. Usual reasons:	<error> is the textual reason this failed. Usual reasons:

=over 2	=over 2

=item Apache config file for loncapa incorrect:	=item Apache config file for loncapa incorrect:

one of the variables	one of the variables
lonCertificateDirectory, lonnetCertificateAuthority, or lonnetCertificate	lonCertificateDirectory, lonnetCertificateAuthority, or lonnetCertificate
undefined or incorrect	undefined or incorrect
Line 8142 Could not rewrite the	Line 8596 Could not rewrite the
internal password file for a user	internal password file for a user

=item Result of password change for <user> : <result>	=item Result of password change for <user> : <result>

A unix password change for <user> was attempted	A unix password change for <user> was attempted
and the pipe returned <result>	and the pipe returned <result>

Line 8171 lond has been asked to exit by its clien	Line 8625 lond has been asked to exit by its clien
client systemand <input> is the full exit command sent to the server.	client systemand <input> is the full exit command sent to the server.

=item Red CRITICAL: ABNORMAL EXIT. child <pid> for server <hostname> died through a crass with this error->[<message>].	=item Red CRITICAL: ABNORMAL EXIT. child <pid> for server <hostname> died through a crass with this error->[<message>].

A lond child terminated. NOte that this termination can also occur when the	A lond child terminated. NOte that this termination can also occur when the
child receives the QUIT or DIE signals. <pid> is the process id of the child,	child receives the QUIT or DIE signals. <pid> is the process id of the child,
<hostname> the host lond is working for, and <message> the reason the child died	<hostname> the host lond is working for, and <message> the reason the child died
Line 8255 file when sent it's USR1 signal. That p	Line 8709 file when sent it's USR1 signal. That p
assumed to be hung in some un-fixable way.	assumed to be hung in some un-fixable way.

=item Finished checking children	=item Finished checking children

Master processs's USR1 processing is cojmplete.	Master processs's USR1 processing is cojmplete.

=item (Red) CRITICAL: ------- Starting ------	=item (Red) CRITICAL: ------- Starting ------
Line 8269 Started a new child process for <client>	Line 8723 Started a new child process for <client>
connected to the child. This was as a result of a TCP/IP connection from a client.	connected to the child. This was as a result of a TCP/IP connection from a client.

=item Unable to determine who caller was, getpeername returned nothing	=item Unable to determine who caller was, getpeername returned nothing

In child process initialization. either getpeername returned undef or	In child process initialization. either getpeername returned undef or
a zero sized object was returned. Processing continues, but in my opinion,	a zero sized object was returned. Processing continues, but in my opinion,
this should be cause for the child to exit.	this should be cause for the child to exit.
Line 8280 In child process initialization. The pe	Line 8734 In child process initialization. The pe
The client address is stored as "Unavailable" and processing continues.	The client address is stored as "Unavailable" and processing continues.

=item (Yellow) INFO: Connection <ip> <name> connection type = <type>	=item (Yellow) INFO: Connection <ip> <name> connection type = <type>

In child initialization. A good connectionw as received from <ip>.	In child initialization. A good connectionw as received from <ip>.

=over 2	=over 2
Line 8330 The client (<client> is the peer's name	Line 8784 The client (<client> is the peer's name
negotiated an SSL connection with this child process.	negotiated an SSL connection with this child process.

=item (Green) Successful insecure authentication with <client>	=item (Green) Successful insecure authentication with <client>


The client has successfully negotiated an insecure connection withthe child process.	The client has successfully negotiated an insecure connection withthe child process.

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.489.2.21
changed lines
	Added in v.1.527