loncom/lond - diff

Return to lond CVS log

Up to [LON-CAPA] / loncom

Diff for /loncom/lond between versions 1.54 and 1.59

version 1.54, 2001/11/15 23:33:57	version 1.59, 2001/11/27 21:59:07
Line 16	Line 16
# 03/24 Gerd Kortemeyer	# 03/24 Gerd Kortemeyer
# 04/02 Scott Harrison	# 04/02 Scott Harrison
# 05/11,05/28,08/30 Gerd Kortemeyer	# 05/11,05/28,08/30 Gerd Kortemeyer
# 9/30,10/22,11/13,11/15 Scott Harrison	# 9/30,10/22,11/13,11/15,11/16 Scott Harrison
	# 11/26,11/27 Gerd Kortemeyer
#	#
# $Id$	# $Id$
###	###
Line 39 use Authen::Krb4;	Line 40 use Authen::Krb4;
use lib '/home/httpd/lib/perl/';	use lib '/home/httpd/lib/perl/';
use localauth;	use localauth;

	my $status='';
	my $lastlog='';

# grabs exception and records it to log before exiting	# grabs exception and records it to log before exiting
sub catchexception {	sub catchexception {
my ($error)=@_;	my ($error)=@_;
Line 47 sub catchexception {	Line 51 sub catchexception {
&logthis("<font color=red>CRITICAL: "	&logthis("<font color=red>CRITICAL: "
."ABNORMAL EXIT. Child $$ for server $wasserver died through "	."ABNORMAL EXIT. Child $$ for server $wasserver died through "
."a crash with this error msg->[$error]</font>");	."a crash with this error msg->[$error]</font>");
	&logthis('Famous last words: '.$status.' - '.$lastlog);
if ($client) { print $client "error: $error\n"; }	if ($client) { print $client "error: $error\n"; }
	$server->close();
die($error);	die($error);
}	}

Line 133 sub REAPER { # ta	Line 139 sub REAPER { # ta
sub HUNTSMAN { # signal handler for SIGINT	sub HUNTSMAN { # signal handler for SIGINT
local($SIG{CHLD}) = 'IGNORE'; # we're going to kill our children	local($SIG{CHLD}) = 'IGNORE'; # we're going to kill our children
kill 'INT' => keys %children;	kill 'INT' => keys %children;
	&logthis("Free socket: ".shutdown($server,2)); # free up socket
my $execdir=$perlvar{'lonDaemons'};	my $execdir=$perlvar{'lonDaemons'};
unlink("$execdir/logs/lond.pid");	unlink("$execdir/logs/lond.pid");
&logthis("<font color=red>CRITICAL: Shutting down</font>");	&logthis("<font color=red>CRITICAL: Shutting down</font>");
Line 142 sub HUNTSMAN { # si	Line 149 sub HUNTSMAN { # si
sub HUPSMAN { # signal handler for SIGHUP	sub HUPSMAN { # signal handler for SIGHUP
local($SIG{CHLD}) = 'IGNORE'; # we're going to kill our children	local($SIG{CHLD}) = 'IGNORE'; # we're going to kill our children
kill 'INT' => keys %children;	kill 'INT' => keys %children;
close($server); # free up socket	&logthis("Free socket: ".shutdown($server,2)); # free up socket
&logthis("<font color=red>CRITICAL: Restarting</font>");	&logthis("<font color=red>CRITICAL: Restarting</font>");
unlink("$execdir/logs/lond.pid");	unlink("$execdir/logs/lond.pid");
my $execdir=$perlvar{'lonDaemons'};	my $execdir=$perlvar{'lonDaemons'};
exec("$execdir/lond"); # here we go again	exec("$execdir/lond"); # here we go again
}	}

	sub checkchildren {
	&initnewstatus();
	&logstatus();
	&logthis('Going to check on the children');
	map {
	sleep 1;
	unless (kill 'USR1' => $_) {
	&logthis ('Child '.$_.' is dead');
	&logstatus($$.' is dead');
	}
	} sort keys %children;
	}

# --------------------------------------------------------------------- Logging	# --------------------------------------------------------------------- Logging

sub logthis {	sub logthis {
Line 157 sub logthis {	Line 177 sub logthis {
my $fh=IO::File->new(">>$execdir/logs/lond.log");	my $fh=IO::File->new(">>$execdir/logs/lond.log");
my $now=time;	my $now=time;
my $local=localtime($now);	my $local=localtime($now);
	$lastlog=$local.': '.$message;
print $fh "$local ($$): $message\n";	print $fh "$local ($$): $message\n";
}	}

	# ------------------------------------------------------------------ Log status

	sub logstatus {
	my $docdir=$perlvar{'lonDocRoot'};
	my $fh=IO::File->new(">>$docdir/lon-status/londstatus.txt");
	print $fh $$."\t".$status."\t".$lastlog."\n";
	}

	sub initnewstatus {
	my $docdir=$perlvar{'lonDocRoot'};
	my $fh=IO::File->new(">$docdir/lon-status/londstatus.txt");
	my $now=time;
	my $local=localtime($now);
	print $fh "LOND status $local - parent $$\n\n";
	}

	# -------------------------------------------------------------- Status setting

	sub status {
	my $what=shift;
	my $now=time;
	my $local=localtime($now);
	$status=$local.': '.$what;
	}

# -------------------------------------------------------- Escape Special Chars	# -------------------------------------------------------- Escape Special Chars

Line 306 open (PIDSAVE,">$execdir/logs/lond.pid")	Line 351 open (PIDSAVE,">$execdir/logs/lond.pid")
print PIDSAVE "$$\n";	print PIDSAVE "$$\n";
close(PIDSAVE);	close(PIDSAVE);
&logthis("<font color=red>CRITICAL: ---------- Starting ----------</font>");	&logthis("<font color=red>CRITICAL: ---------- Starting ----------</font>");
	&status('Starting');

# ------------------------------------------------------- Now we are on our own	# ------------------------------------------------------- Now we are on our own

Line 316 for (1 .. $PREFORK) {	Line 362 for (1 .. $PREFORK) {

# ----------------------------------------------------- Install signal handlers	# ----------------------------------------------------- Install signal handlers

	&status('Forked children');

$SIG{CHLD} = \&REAPER;	$SIG{CHLD} = \&REAPER;
$SIG{INT} = $SIG{TERM} = \&HUNTSMAN;	$SIG{INT} = $SIG{TERM} = \&HUNTSMAN;
$SIG{HUP} = \&HUPSMAN;	$SIG{HUP} = \&HUPSMAN;
	$SIG{USR1} = \&checkchildren;

# And maintain the population.	# And maintain the population.
while (1) {	while (1) {
	&status('Sleeping');
sleep; # wait for a signal (i.e., child's death)	sleep; # wait for a signal (i.e., child's death)
	&logthis('Woke up');
	&status('Woke up');
for ($i = $children; $i < $PREFORK; $i++) {	for ($i = $children; $i < $PREFORK; $i++) {
make_new_child(); # top up the child pool	make_new_child(); # top up the child pool
}	}
Line 346 sub make_new_child {	Line 398 sub make_new_child {
or die "Can't unblock SIGINT for fork: $!\n";	or die "Can't unblock SIGINT for fork: $!\n";
$children{$pid} = 1;	$children{$pid} = 1;
$children++;	$children++;
	&status('Started child '.$pid);
return;	return;
} else {	} else {
# Child can not return from this subroutine.	# Child can not return from this subroutine.
$SIG{INT} = 'DEFAULT'; # make SIGINT kill us as it did before	$SIG{INT} = 'DEFAULT'; # make SIGINT kill us as it did before
	$SIG{USR1}= \&logstatus;
	$lastlog='Forked ';
	$status='Forked';

# unblock signals	# unblock signals
sigprocmask(SIG_UNBLOCK, $sigset)	sigprocmask(SIG_UNBLOCK, $sigset)
or die "Can't unblock SIGINT for fork: $!\n";	or die "Can't unblock SIGINT for fork: $!\n";
Line 359 sub make_new_child {	Line 415 sub make_new_child {

# handle connections until we've reached $MAX_CLIENTS_PER_CHILD	# handle connections until we've reached $MAX_CLIENTS_PER_CHILD
for ($i=0; $i < $MAX_CLIENTS_PER_CHILD; $i++) {	for ($i=0; $i < $MAX_CLIENTS_PER_CHILD; $i++) {
	&status('Idle, waiting for connection');
$client = $server->accept() or last;	$client = $server->accept() or last;
	&status('Accepted connection');
# =============================================================================	# =============================================================================
# do something with the connection	# do something with the connection
# -----------------------------------------------------------------------------	# -----------------------------------------------------------------------------
Line 372 sub make_new_child {	Line 429 sub make_new_child {
&logthis(	&logthis(
"<font color=yellow>INFO: Connection $i, $clientip ($hostid{$clientip})</font>"	"<font color=yellow>INFO: Connection $i, $clientip ($hostid{$clientip})</font>"
);	);
	&status("Connecting $clientip ($hostid{$clientip})");
my $clientok;	my $clientok;
if ($clientrec) {	if ($clientrec) {
	&status("Waiting for init from $clientip ($hostid{$clientip})");
my $remotereq=<$client>;	my $remotereq=<$client>;
$remotereq=~s/\W//g;	$remotereq=~s/\W//g;
if ($remotereq eq 'init') {	if ($remotereq eq 'init') {
my $challenge="$$".time;	my $challenge="$$".time;
print $client "$challenge\n";	print $client "$challenge\n";
	&status(
	"Waiting for challenge reply from $clientip ($hostid{$clientip})");
$remotereq=<$client>;	$remotereq=<$client>;
$remotereq=~s/\W//g;	$remotereq=~s/\W//g;
if ($challenge eq $remotereq) {	if ($challenge eq $remotereq) {
Line 387 sub make_new_child {	Line 448 sub make_new_child {
} else {	} else {
&logthis(	&logthis(
"<font color=blue>WARNING: $clientip did not reply challenge</font>");	"<font color=blue>WARNING: $clientip did not reply challenge</font>");
print $client "bye\n";	&status('No challenge reply '.$clientip);
}	}
} else {	} else {
&logthis(	&logthis(
"<font color=blue>WARNING: "	"<font color=blue>WARNING: "
."$clientip failed to initialize: >$remotereq< </font>");	."$clientip failed to initialize: >$remotereq< </font>");
print $client "bye\n";	&status('No init '.$clientip);
}	}
} else {	} else {
&logthis(	&logthis(
"<font color=blue>WARNING: Unknown client $clientip</font>");	"<font color=blue>WARNING: Unknown client $clientip</font>");
print $client "bye\n";	&status('Hung up on '.$clientip);
}	}
if ($clientok) {	if ($clientok) {
# ---------------- New known client connecting, could mean machine online again	# ---------------- New known client connecting, could mean machine online again
&reconlonc("$perlvar{'lonSockDir'}/$hostid{$clientip}");	&reconlonc("$perlvar{'lonSockDir'}/$hostid{$clientip}");
&logthis(	&logthis(
"<font color=green>Established connection: $hostid{$clientip}</font>");	"<font color=green>Established connection: $hostid{$clientip}</font>");
	&status('Will listen to '.$hostid{$clientip});
# ------------------------------------------------------------ Process requests	# ------------------------------------------------------------ Process requests
while (my $userinput=<$client>) {	while (my $userinput=<$client>) {
chomp($userinput);	chomp($userinput);
	&status('Processing '.$hostid{$clientip}.': '.$userinput);
my $wasenc=0;	my $wasenc=0;
# ------------------------------------------------------------ See if encrypted	# ------------------------------------------------------------ See if encrypted
if ($userinput =~ /^enc/) {	if ($userinput =~ /^enc/) {
Line 567 sub make_new_child {	Line 630 sub make_new_child {
}	}
# -------------------------------------------------------------------- makeuser	# -------------------------------------------------------------------- makeuser
} elsif ($userinput =~ /^makeuser/) {	} elsif ($userinput =~ /^makeuser/) {
	my $oldumask=umask(0077);
if ($wasenc==1) {	if ($wasenc==1) {
my	my
($cmd,$udom,$uname,$umode,$npass)=split(/:/,$userinput);	($cmd,$udom,$uname,$umode,$npass)=split(/:/,$userinput);
Line 642 sub make_new_child {	Line 706 sub make_new_child {
} else {	} else {
print $client "refused\n";	print $client "refused\n";
}	}
	umask($oldumask);
	# -------------------------------------------------------------- changeuserauth
	} elsif ($userinput =~ /^changeuserauth/) {
	if ($wasenc==1) {
	my
	($cmd,$udom,$uname,$umode,$npass)=split(/:/,$userinput);
	chomp($npass);
	$npass=&unescape($npass);
	my $proname=propath($udom,$uname);
	my $passfilename="$proname/passwd";
	if ($udom ne $perlvar{'lonDefDomain'}) {
	print $client "not_right_domain\n";
	} else {
	if ($umode eq 'krb4') {
	{
	my $pf = IO::File->new(">$passfilename");
	print $pf "krb4:$npass\n";
	}
	print $client "ok\n";
	} elsif ($umode eq 'internal') {
	my $salt=time;
	$salt=substr($salt,6,2);
	my $ncpass=crypt($npass,$salt);
	{
	my $pf = IO::File->new(">$passfilename");
	print $pf "internal:$ncpass\n";
	}
	print $client "ok\n";
	} elsif ($umode eq 'localauth') {
	{
	my $pf = IO::File->new(">$passfilename");
	print $pf "localauth:$npass\n";
	}
	print $client "ok\n";
	} elsif ($umode eq 'unix') {
	{
	my $execpath="$perlvar{'lonDaemons'}/".
	"lcuseradd";
	{
	my $se = IO::File->new("\|$execpath");
	print $se "$uname\n";
	print $se "$npass\n";
	print $se "$npass\n";
	}
	my $pf = IO::File->new(">$passfilename");
	print $pf "unix:\n";
	}
	print $client "ok\n";
	} elsif ($umode eq 'none') {
	{
	my $pf = IO::File->new(">$passfilename");
	print $pf "none:\n";
	}
	print $client "ok\n";
	} else {
	print $client "auth_mode_error\n";
	}
	}
	} else {
	print $client "refused\n";
	}
# ------------------------------------------------------------------------ home	# ------------------------------------------------------------------------ home
} elsif ($userinput =~ /^home/) {	} elsif ($userinput =~ /^home/) {
my ($cmd,$udom,$uname)=split(/:/,$userinput);	my ($cmd,$udom,$uname)=split(/:/,$userinput);
Line 1168 sub make_new_child {	Line 1293 sub make_new_child {
&logthis(	&logthis(
"Client $clientip ($hostid{$clientip}) hanging up: $userinput");	"Client $clientip ($hostid{$clientip}) hanging up: $userinput");
print $client "bye\n";	print $client "bye\n";
	$client->close();
last;	last;
# ------------------------------------------------------------- unknown command	# ------------------------------------------------------------- unknown command
} else {	} else {
# unknown command	# unknown command
print $client "unknown_cmd\n";	print $client "unknown_cmd\n";
}	}
# ------------------------------------------------------ client unknown, refuse	# -------------------------------------------------------------------- complete
	&status('Listening to '.$hostid{$clientip});
}	}
	# --------------------------------------------- client unknown or fishy, refuse
} else {	} else {
print $client "refused\n";	print $client "refused\n";
	$client->close();
&logthis("<font color=blue>WARNING: "	&logthis("<font color=blue>WARNING: "
."Rejected client $clientip, closing connection</font>");	."Rejected client $clientip, closing connection</font>");
}	}
Line 1188 sub make_new_child {	Line 1317 sub make_new_child {

# tidy up gracefully and finish	# tidy up gracefully and finish

	$client->close();
	$server->close();

# this exit is VERY important, otherwise the child will become	# this exit is VERY important, otherwise the child will become
# a producer of more and more children, forking yourself into	# a producer of more and more children, forking yourself into
# process death.	# process death.

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

Removed from v.1.54
changed lines
	Added in v.1.59