loncom/lond - diff

Return to lond CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/lond between versions 1.489.2.29 and 1.520

version 1.489.2.29, 2018/04/29 00:40:49	version 1.520, 2016/05/08 19:05:10
Line 1425 sub du2_handler {	Line 1425 sub du2_handler {
# selected directory the filename followed by the full output of	# selected directory the filename followed by the full output of
# the stat function is returned. The returned info for each	# the stat function is returned. The returned info for each
# file are separated by ':'. The stat fields are separated by &'s.	# file are separated by ':'. The stat fields are separated by &'s.
#
# If the requested path contains /../ or is:
#
# 1. for a directory, and the path does not begin with one of:
# (a) /home/httpd/html/res/<domain>
# (b) /home/httpd/html/userfiles/
# (c) /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/userfiles
# or is:
#
# 2. for a file, and the path (after prepending) does not begin with one of:
# (a) /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/
# (b) /home/httpd/html/res/<domain>/<username>/
# (c) /home/httpd/html/userfiles/<domain>/<username>/
#
# the response will be "refused".
#
# Parameters:	# Parameters:
# $cmd - The command that dispatched us (ls).	# $cmd - The command that dispatched us (ls).
# $ulsdir - The directory path to list... I'm not sure what this	# $ulsdir - The directory path to list... I'm not sure what this
Line 1462 sub ls_handler {	Line 1446 sub ls_handler {
my $rights;	my $rights;
my $ulsout='';	my $ulsout='';
my $ulsfn;	my $ulsfn;
if ($ulsdir =~m{/\.\./}) {
&Failure($client,"refused\n",$userinput);
return 1;
}
if (-e $ulsdir) {	if (-e $ulsdir) {
if(-d $ulsdir) {	if(-d $ulsdir) {
unless (($ulsdir =~ m{^/home/httpd/html/(res/$LONCAPA::match_domain\|userfiles/)}) \|\|
($ulsdir =~ m{^/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_name/userfiles})) {
&Failure($client,"refused\n",$userinput);
return 1;
}
if (opendir(LSDIR,$ulsdir)) {	if (opendir(LSDIR,$ulsdir)) {
while ($ulsfn=readdir(LSDIR)) {	while ($ulsfn=readdir(LSDIR)) {
undef($obs);	undef($obs);
Line 1496 sub ls_handler {	Line 1471 sub ls_handler {
closedir(LSDIR);	closedir(LSDIR);
}	}
} else {	} else {
unless (($ulsdir =~ m{^/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_name/}) \|\|
($ulsdir =~ m{^/home/httpd/html/(?:res\|userfiles)/$LONCAPA::match_domain/$LONCAPA::match_name/})) {
&Failure($client,"refused\n",$userinput);
return 1;
}
my @ulsstats=stat($ulsdir);	my @ulsstats=stat($ulsdir);
$ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';	$ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
}	}
Line 1525 sub ls_handler {	Line 1495 sub ls_handler {
# selected directory the filename followed by the full output of	# selected directory the filename followed by the full output of
# the stat function is returned. The returned info for each	# the stat function is returned. The returned info for each
# file are separated by ':'. The stat fields are separated by &'s.	# file are separated by ':'. The stat fields are separated by &'s.
#
# If the requested path contains /../ or is:
#
# 1. for a directory, and the path does not begin with one of:
# (a) /home/httpd/html/res/<domain>
# (b) /home/httpd/html/userfiles/
# (c) /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/userfiles
# or is:
#
# 2. for a file, and the path (after prepending) does not begin with one of:
# (a) /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/
# (b) /home/httpd/html/res/<domain>/<username>/
# (c) /home/httpd/html/userfiles/<domain>/<username>/
#
# the response will be "refused".
#
# Parameters:	# Parameters:
# $cmd - The command that dispatched us (ls).	# $cmd - The command that dispatched us (ls).
# $ulsdir - The directory path to list... I'm not sure what this	# $ulsdir - The directory path to list... I'm not sure what this
Line 1561 sub ls2_handler {	Line 1515 sub ls2_handler {
my $rights;	my $rights;
my $ulsout='';	my $ulsout='';
my $ulsfn;	my $ulsfn;
if ($ulsdir =~m{/\.\./}) {
&Failure($client,"refused\n",$userinput);
return 1;
}
if (-e $ulsdir) {	if (-e $ulsdir) {
if(-d $ulsdir) {	if(-d $ulsdir) {
unless (($ulsdir =~ m{^/home/httpd/html/(res/$LONCAPA::match_domain\|userfiles/)}) \|\|
($ulsdir =~ m{^/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_name/userfiles})) {
&Failure($client,"refused\n","$userinput");
return 1;
}
if (opendir(LSDIR,$ulsdir)) {	if (opendir(LSDIR,$ulsdir)) {
while ($ulsfn=readdir(LSDIR)) {	while ($ulsfn=readdir(LSDIR)) {
undef($obs);	undef($obs);
Line 1596 sub ls2_handler {	Line 1541 sub ls2_handler {
closedir(LSDIR);	closedir(LSDIR);
}	}
} else {	} else {
unless (($ulsdir =~ m{^/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_name/}) \|\|
($ulsdir =~ m{^/home/httpd/html/(?:res\|userfiles)/$LONCAPA::match_domain/$LONCAPA::match_name/})) {
&Failure($client,"refused\n",$userinput);
return 1;
}
my @ulsstats=stat($ulsdir);	my @ulsstats=stat($ulsdir);
$ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';	$ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
}	}
Line 1617 sub ls2_handler {	Line 1557 sub ls2_handler {
# selected directory the filename followed by the full output of	# selected directory the filename followed by the full output of
# the stat function is returned. The returned info for each	# the stat function is returned. The returned info for each
# file are separated by ':'. The stat fields are separated by &'s.	# file are separated by ':'. The stat fields are separated by &'s.
#
# If the requested path (after prepending) contains /../ or is:
#
# 1. for a directory, and the path does not begin with one of:
# (a) /home/httpd/html/res/<domain>
# (b) /home/httpd/html/userfiles/
# (c) /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/userfiles
# (d) /home/httpd/html/priv/<domain> and client is the homeserver
#
# or is:
#
# 2. for a file, and the path (after prepending) does not begin with one of:
# (a) /home/httpd/lonUsers/<domain>/<1>/<2>/<3>/<username>/
# (b) /home/httpd/html/res/<domain>/<username>/
# (c) /home/httpd/html/userfiles/<domain>/<username>/
# (d) /home/httpd/html/priv/<domain>/<username>/ and client is the homeserver
#
# the response will be "refused".
#
# Parameters:	# Parameters:
# $cmd - The command that dispatched us (ls).	# $cmd - The command that dispatched us (ls).
# $tail - The tail of the request that invoked us.	# $tail - The tail of the request that invoked us.
Line 1675 sub ls3_handler {	Line 1596 sub ls3_handler {
}	}

my $dir_root = $perlvar{'lonDocRoot'};	my $dir_root = $perlvar{'lonDocRoot'};
if (($getpropath) \|\| ($getuserdir)) {	if ($getpropath) {
if (($uname =~ /^$LONCAPA::match_name$/) && ($udom =~ /^$LONCAPA::match_domain$/)) {	if (($uname =~ /^$LONCAPA::match_name$/) && ($udom =~ /^$LONCAPA::match_domain$/)) {
$dir_root = &propath($udom,$uname);	$dir_root = &propath($udom,$uname);
$dir_root =~ s/\/$//;	$dir_root =~ s/\/$//;
} else {	} else {
&Failure($client,"refused\n",$userinput);	&Failure($client,"refused\n","$cmd:$tail");
	return 1;
	}
	} elsif ($getuserdir) {
	if (($uname =~ /^$LONCAPA::match_name$/) && ($udom =~ /^$LONCAPA::match_domain$/)) {
	my $subdir=$uname.'__';
	$subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
	$dir_root = $Apache::lonnet::perlvar{'lonUsersDir'}
	."/$udom/$subdir/$uname";
	} else {
	&Failure($client,"refused\n","$cmd:$tail");
return 1;	return 1;
}	}
} elsif ($alternate_root ne '') {	} elsif ($alternate_root ne '') {
Line 1693 sub ls3_handler {	Line 1624 sub ls3_handler {
$ulsdir = $dir_root.'/'.$ulsdir;	$ulsdir = $dir_root.'/'.$ulsdir;
}	}
}	}
if ($ulsdir =~m{/\.\./}) {
&Failure($client,"refused\n",$userinput);
return 1;
}
my $islocal;
my @machine_ids = &Apache::lonnet::current_machine_ids();
if (grep(/^\Q$clientname\E$/,@machine_ids)) {
$islocal = 1;
}
my $obs;	my $obs;
my $rights;	my $rights;
my $ulsout='';	my $ulsout='';
my $ulsfn;	my $ulsfn;
if (-e $ulsdir) {	if (-e $ulsdir) {
if(-d $ulsdir) {	if(-d $ulsdir) {
unless (($getpropath) \|\| ($getuserdir) \|\|
($ulsdir =~ m{^/home/httpd/html/(res/$LONCAPA::match_domain\|userfiles/)}) \|\|
($ulsdir =~ m{^/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_name/userfiles}) \|\|
(($ulsdir =~ m{^/home/httpd/html/priv/$LONCAPA::match_domain}) && ($islocal))) {
&Failure($client,"refused\n",$userinput);
return 1;
}
if (opendir(LSDIR,$ulsdir)) {	if (opendir(LSDIR,$ulsdir)) {
while ($ulsfn=readdir(LSDIR)) {	while ($ulsfn=readdir(LSDIR)) {
undef($obs);	undef($obs);
Line 1739 sub ls3_handler {	Line 1654 sub ls3_handler {
closedir(LSDIR);	closedir(LSDIR);
}	}
} else {	} else {
unless (($getpropath) \|\| ($getuserdir) \|\|
($ulsdir =~ m{^/home/httpd/lonUsers/$LONCAPA::match_domain(?:/[\w\-.@]){3}/$LONCAPA::match_name/}) \|\|
($ulsdir =~ m{^/home/httpd/html/(?:res\|userfiles)/$LONCAPA::match_domain/$LONCAPA::match_name/}) \|\|
(($ulsdir =~ m{^/home/httpd/html/priv/$LONCAPA::match_domain/$LONCAPA::match_name/}) && ($islocal))) {
&Failure($client,"refused\n",$userinput);
return 1;
}
my @ulsstats=stat($ulsdir);	my @ulsstats=stat($ulsdir);
$ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';	$ulsout.=$ulsfn.'&'.join('&',@ulsstats).':';
}	}
Line 2027 sub authenticate_handler {	Line 1935 sub authenticate_handler {
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 2130 sub change_password_handler {	Line 2034 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 2162 sub hash_passwd {	Line 2066 sub hash_passwd {
my $plainsalt = substr($rest[1],0,22);	my $plainsalt = substr($rest[1],0,22);
$salt = Crypt::Eksblowfish::Bcrypt::de_base64($plainsalt);	$salt = Crypt::Eksblowfish::Bcrypt::de_base64($plainsalt);
} else {	} else {
my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);	my $defaultcost;
my $defaultcost = $domdefaults{'intauth_cost'};	my %domconfig =
	&Apache::lonnet::get_dom('configuration',['password'],$domain);
	if (ref($domconfig{'password'}) eq 'HASH') {
	$defaultcost = $domconfig{'password'}{'cost'};
	}
if (($defaultcost eq '') \|\| ($defaultcost =~ /D/)) {	if (($defaultcost eq '') \|\| ($defaultcost =~ /D/)) {
$cost = 10;	$cost = 10;
} else {	} else {
Line 2298 sub change_authentication_handler {	Line 2206 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 2588 sub remove_user_file_handler {	Line 2496 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 2968 sub newput_user_profile_entry {	Line 2876 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 3371 sub get_profile_keys {	Line 3279 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 3450 sub dump_with_regexp {	Line 3369 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 3492 sub store_handler {	Line 3411 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 3522 sub store_handler {	Line 3440 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 3539 sub store_handler {	Line 3456 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 3801 sub send_query_handler {	Line 3718 sub send_query_handler {

my ($query,$arg1,$arg2,$arg3)=split(/\:/,$tail);	my ($query,$arg1,$arg2,$arg3)=split(/\:/,$tail);
$query=~s/\n*$//g;	$query=~s/\n*$//g;
if (($query eq 'usersearch') \|\| ($query eq 'instdirsearch')) {
my $usersearchconf = &get_usersearch_config($currentdomainid,'directorysrch');
my $earlyout;
if (ref($usersearchconf) eq 'HASH') {
if ($currentdomainid eq $clienthomedom) {
if ($query eq 'usersearch') {
if ($usersearchconf->{'lcavailable'} eq '0') {
$earlyout = 1;
}
} else {
if ($usersearchconf->{'available'} eq '0') {
$earlyout = 1;
}
}
} else {
if ($query eq 'usersearch') {
if ($usersearchconf->{'lclocalonly'}) {
$earlyout = 1;
}
} else {
if ($usersearchconf->{'localonly'}) {
$earlyout = 1;
}
}
}
}
if ($earlyout) {
&Reply($client, "query_not_authorized\n");
return 1;
}
}
&Reply($client, "". &sql_reply("$clientname\&$query".	&Reply($client, "". &sql_reply("$clientname\&$query".
"\&$arg1"."\&$arg2"."\&$arg3")."\n",	"\&$arg1"."\&$arg2"."\&$arg3")."\n",
$userinput);	$userinput);
Line 4087 sub put_course_id_hash_handler {	Line 3973 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 4097 sub put_course_id_hash_handler {	Line 3983 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 4544 sub put_domain_handler {	Line 4441 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 4703 sub get_id_handler {	Line 4716 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 5388 sub validate_course_section_handler {	Line 5401 sub validate_course_section_handler {
# Formal Parameters:	# Formal Parameters:
# $cmd - The command request that got us dispatched.	# $cmd - The command request that got us dispatched.
# $tail - The tail of the command. In this case this is a colon separated	# $tail - The tail of the command. In this case this is a colon separated
# set of values that will be split into:	# set of words that will be split into:
# $inst_class - Institutional code for the specific class section	# $inst_class - Institutional code for the specific class section
# $ownerlist - An escaped comma-separated list of username:domain	# $courseowner - The escaped username:domain of the course owner
# of the course owner, and co-owner(s).
# $cdom - The domain of the course from the institution's	# $cdom - The domain of the course from the institution's
# point of view.	# point of view.
# $client - The socket open on the client.	# $client - The socket open on the client.
Line 5416 sub validate_class_access_handler {	Line 5428 sub validate_class_access_handler {
&register_handler("autovalidateclass_sec", \&validate_class_access_handler, 0, 1, 0);	&register_handler("autovalidateclass_sec", \&validate_class_access_handler, 0, 1, 0);

#	#
# Validate course owner or co-owners(s) access to enrollment data for all sections
# and crosslistings for a particular 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 values that will be split into:
# $ownerlist - An escaped comma-separated list of username:domain
# of the course owner, and co-owner(s).
# $cdom - The domain of the course from the institution's
# point of view.
# $classes - Frozen hash of institutional course sections and
# crosslistings.
# $client - The socket open on the client.
# Returns:
# 1 - continue processing.
#

sub validate_classes_handler {
my ($cmd, $tail, $client) = @_;
my $userinput = "$cmd:$tail";
my ($ownerlist,$cdom,$classes) = split(/:/, $tail);
my $classesref = &Apache::lonnet::thaw_unescape($classes);
my $owners = &unescape($ownerlist);
my $result;
eval {
local($SIG{__DIE__})='DEFAULT';
my %validations;
my $response = &localenroll::check_instclasses($owners,$cdom,$classesref,
\%validations);
if ($response eq 'ok') {
foreach my $key (keys(%validations)) {
$result .= &escape($key).'='.&Apache::lonnet::freeze_escape($validations{$key}).'&';
}
$result =~ s/\&$//;
} else {
$result = 'error';
}
};
if (!$@) {
&Reply($client, \$result, $userinput);
} else {
&Failure($client,"unknown_cmd\n",$userinput);
}
return 1;
}
&register_handler("autovalidateinstclasses", \&validate_classes_handler, 0, 1, 0);

#
# Create a password for a new LON-CAPA user added by auto-enrollment.	# 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	# Only used for case where authentication method for new user is localauth
#	#
Line 5500 sub create_auto_enroll_password_handler	Line 5462 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 retrieve.	# $filename - The name of the file to remove.
# 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 5566 sub retrieve_auto_file_handler {	Line 5482 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 ( (-e $source) && ($filename ne '') ) {
&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 '') ) {
my $reply = '';	my $reply = '';
if (open(my $fh,$source)) {	if (open(my $fh,$source)) {
while (<$fh>) {	while (<$fh>) {
Line 5602 sub crsreq_checks_handler {	Line 5514 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 6647 sub Debug {	Line 6559 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 6900 sub make_new_child {	Line 6815 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 6912 sub make_new_child {	Line 6827 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 6957 sub make_new_child {	Line 6872 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 7027 sub make_new_child {	Line 6942 sub make_new_child {
."Attempted insecure connection disallowed </font>");	."Attempted insecure connection disallowed </font>");
close $client;	close $client;
$clientok = 0;	$clientok = 0;

}	}
}	}
} else {	} else {
Line 7035 sub make_new_child {	Line 6951 sub make_new_child {
."$clientip failed to initialize: >$remotereq< </font>");	."$clientip failed to initialize: >$remotereq< </font>");
&status('No init '.$clientip);	&status('No init '.$clientip);
}	}

} else {	} else {
&logthis(	&logthis(
"<font color='blue'>WARNING: Unknown client $clientip</font>");	"<font color='blue'>WARNING: Unknown client $clientip</font>");
Line 7192 sub password_filename {	Line 7109 sub password_filename {
# domain - domain of the user.	# domain - domain of the user.
# name - User's name.	# name - User's name.
# contents - New contents of the file.	# contents - New contents of the file.
# saveold - (optional). If true save old file in a passwd.bak file.
# Returns:	# Returns:
# 0 - Failed.	# 0 - Failed.
# 1 - Success.	# 1 - Success.
#	#
sub rewrite_password_file {	sub rewrite_password_file {
my ($domain, $user, $contents, $saveold) = @_;	my ($domain, $user, $contents) = @_;

my $file = &password_filename($domain, $user);	my $file = &password_filename($domain, $user);
if (defined $file) {	if (defined $file) {
if ($saveold) {
my $bakfile = $file.'.bak';
if (CopyFile($file,$bakfile)) {
chmod(0400,$bakfile);
&logthis("Old password saved in passwd.bak for internally authenticated user: $user:$domain");
} else {
&logthis("Failed to save old password in passwd.bak for internally authenticated user: $user:$domain");
}
}
my $pf = IO::File->new(">$file");	my $pf = IO::File->new(">$file");
if($pf) {	if($pf) {
print $pf "$contents\n";	print $pf "$contents\n";
Line 7301 sub validate_user {	Line 7208 sub validate_user {
$contentpwd = $domdefaults{'auth_arg_def'};	$contentpwd = $domdefaults{'auth_arg_def'};
}	}
}	}
}	}
if ($howpwd ne 'nouser') {	if ($howpwd ne 'nouser') {
if($howpwd eq "internal") { # Encrypted is in local password file.	if($howpwd eq "internal") { # Encrypted is in local password file.
if (length($contentpwd) == 13) {	if (length($contentpwd) == 13) {
$validated = (crypt($password,$contentpwd) eq $contentpwd);	$validated = (crypt($password,$contentpwd) eq $contentpwd);
if ($validated) {	if ($validated) {
my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);	my $ncpass = &hash_passwd($domain,$password);
if ($domdefaults{'intauth_switch'}) {	if (&rewrite_password_file($domain,$user,"$howpwd:$ncpass")) {
my $ncpass = &hash_passwd($domain,$password);	&update_passwd_history($user,$domain,$howpwd,'conversion');
my $saveold;	&logthis("Validated password hashed with bcrypt for $user:$domain");
if ($domdefaults{'intauth_switch'} == 2) {
$saveold = 1;
}
if (&rewrite_password_file($domain,$user,"$howpwd:$ncpass",$saveold)) {
&update_passwd_history($user,$domain,$howpwd,'conversion');
&logthis("Validated password hashed with bcrypt for $user:$domain");
}
}	}
}	}
} else {	} else {
$validated = &check_internal_passwd($password,$contentpwd,$domain,$user);	$validated = &check_internal_passwd($password,$contentpwd,$domain);
}	}
}	}
elsif ($howpwd eq "unix") { # User is a normal unix user.	elsif ($howpwd eq "unix") { # User is a normal unix user.
Line 7391 sub validate_user {	Line 7291 sub validate_user {
}	}

sub check_internal_passwd {	sub check_internal_passwd {
my ($plainpass,$stored,$domain,$user) = @_;	my ($plainpass,$stored,$domain) = @_;
my (undef,$method,@rest) = split(/!/,$stored);	my (undef,$method,@rest) = split(/!/,$stored);
if ($method eq 'bcrypt') {	if ($method eq "bcrypt") {
my $result = &hash_passwd($domain,$plainpass,@rest);	my $result = &hash_passwd($domain,$plainpass,@rest);
if ($result ne $stored) {	if ($result ne $stored) {
return 0;	return 0;
}	}
my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);	# Upgrade to a larger number of rounds if necessary
if ($domdefaults{'intauth_check'}) {	my $defaultcost;
# Upgrade to a larger number of rounds if necessary	my %domconfig =
my $defaultcost = $domdefaults{'intauth_cost'};	&Apache::lonnet::get_dom('configuration',['password'],$domain);
if (($defaultcost eq '') \|\| ($defaultcost =~ /D/)) {	if (ref($domconfig{'password'}) eq 'HASH') {
$defaultcost = 10;	$defaultcost = $domconfig{'password'}{'cost'};
}
if (int($rest[0])<int($defaultcost)) {
if ($domdefaults{'intauth_check'} == 1) {
my $ncpass = &hash_passwd($domain,$plainpass);
if (&rewrite_password_file($domain,$user,"internal:$ncpass")) {
&update_passwd_history($user,$domain,'internal','update cost');
&logthis("Validated password hashed with bcrypt for $user:$domain");
}
return 1;
} elsif ($domdefaults{'intauth_check'} == 2) {
return 0;
}
}
} else {
return 1;
}	}
	if (($defaultcost eq '') \|\| ($defaultcost =~ /D/)) {
	$defaultcost = 10;
	}
	return 1 unless($rest[0]<$defaultcost);
}	}
return 0;	return 0;
}	}
Line 7767 sub make_passwd_file {	Line 7656 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 7778 sub make_passwd_file {	Line 7667 sub make_passwd_file {
my $pf = IO::File->new(">$passfilename");	my $pf = IO::File->new(">$passfilename");
if($pf) {	if($pf) {
print $pf "localauth:$npass\n";	print $pf "localauth:$npass\n";
&update_passwd_history($uname,$udom,$umode,$action);
} else {	} else {
$result = "pass_file_failed_error";	$result = "pass_file_failed_error";
}	}
Line 7849 sub get_usersession_config {	Line 7737 sub get_usersession_config {
return;	return;
}	}

sub get_usersearch_config {
my ($dom,$name) = @_;
my ($usersearchconf,$cached)=&Apache::lonnet::is_cached_new($name,$dom);
if (defined($cached)) {
return $usersearchconf;
} else {
my %domconfig = &Apache::lonnet::get_dom('configuration',['directorysrch'],$dom);
&Apache::lonnet::do_cache_new($name,$dom,$domconfig{'directorysrch'},3600);
return $domconfig{'directorysrch'};
}
return;
}

sub distro_and_arch {	sub distro_and_arch {
return $dist.':'.$arch;	return $dist.':'.$arch;
Line 8045 Allow for a password to be set.	Line 7923 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 8134 for each student, defined perhaps by the	Line 8012 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 8190 Authen::Krb5	Line 8072 Authen::Krb5

=head1 COREQUISITES	=head1 COREQUISITES

	none

=head1 OSNAMES	=head1 OSNAMES

linux	linux
Line 8277 or the CA's certificate in the call to l	Line 8161 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 8398 Could not rewrite the	Line 8282 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 8427 lond has been asked to exit by its clien	Line 8311 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 8511 file when sent it's USR1 signal. That p	Line 8395 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 8525 Started a new child process for <client>	Line 8409 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 8536 In child process initialization. The pe	Line 8420 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 8586 The client (<client> is the peer's name	Line 8470 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.29
changed lines
	Added in v.1.520