--- loncom/lond	2003/08/12 09:39:23	1.135
+++ loncom/lond	2003/08/26 11:15:57	1.140
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.135 2003/08/12 09:39:23 foxr Exp $
+# $Id: lond,v 1.140 2003/08/26 11:15:57 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -81,12 +81,14 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.135 $'; #' stupid emacs
+my $VERSION='$Revision: 1.140 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid;
 my $currentdomainid;
 
 my $client;
+my $clientip;
+
 my $server;
 my $thisserver;
 
@@ -133,6 +135,44 @@ my @adderrors    = ("ok",
 
 
 #
+#   GetCertificate: Given a transaction that requires a certificate,
+#   this function will extract the certificate from the transaction
+#   request.  Note that at this point, the only concept of a certificate
+#   is the hostname to which we are connected.
+#
+#   Parameter:
+#      request   - The request sent by our client (this parameterization may
+#                  need to change when we really use a certificate granting
+#                  authority.
+#
+sub GetCertificate {
+    my $request = shift;
+
+    return $clientip;
+}
+
+
+#
+#  ValidManager: Determines if a given certificate represents a valid manager.
+#                in this primitive implementation, the 'certificate' is
+#                just the connecting loncapa client name.  This is checked
+#                against a valid client list in the configuration.
+#
+#                  
+sub ValidManager {
+    my $certificate = shift; 
+
+    my $hostentry   = $hostid{$certificate};
+    if ($hostentry ne undef) {
+	&logthis('<font color="yellow">Authenticating manager'.
+		 " $hostentry</font>");
+	return 1;
+    } else {
+	&logthis('<font color="red"> Failed manager authentication '.
+		 "$certificate </font>");
+    }
+}
+#
 #  Convert an error return code from lcpasswd to a string value.
 #
 sub lcpasswdstrerror {
@@ -534,7 +574,6 @@ sub make_new_child {
     sigprocmask(SIG_BLOCK, $sigset)
         or die "Can't block SIGINT for fork: $!\n";
 
-    my $clientip;
     die "fork: $!" unless defined ($pid = fork);
     
     if ($pid) {
@@ -652,7 +691,7 @@ sub make_new_child {
 		   if ($userinput =~ /^ping/) {
                        print $client "$currenthostid\n";
 # ------------------------------------------------------------------------ pong
-		   } elsif ($userinput =~ /^pong/) {
+		   }elsif ($userinput =~ /^pong/) {
                        my $reply=&reply("ping",$hostid{$clientip});
                        print $client "$currenthostid:$reply\n"; 
 # ------------------------------------------------------------------------ ekey
@@ -683,6 +722,10 @@ sub make_new_child {
 		   } elsif ($userinput =~ /^userload/) {
 		       my $userloadpercent=&userload();
 		       print $client "$userloadpercent\n";
+
+#
+#        Transactions requiring encryption:
+#
 # ----------------------------------------------------------------- currentauth
 		   } elsif ($userinput =~ /^currentauth/) {
 		     if ($wasenc==1) {
@@ -697,6 +740,30 @@ sub make_new_child {
 		     } else {
 		       print $client "refused\n";
 		     }
+#--------------------------------------------------------------------- pushfile
+		   } elsif($userinput =~ /^pushfile/) { 
+		       if($wasenc == 1) {
+			   my $cert = GetCertificate($userinput);
+			   if(ValidManager($cert)) {
+			       print $client "ok\n";
+			   } else {
+			       print $client "refused\n";
+			   } 
+		       } else {
+			   print $client "refused\n";
+		       }
+#--------------------------------------------------------------------- reinit
+		   } elsif($userinput =~ /^reinit/) {
+		       if ($wasenc == 1) {
+			   my $cert = GetCertificate($userinput);
+			   if(ValidManager($cert)) {
+			       print $client "ok\n";
+			   } else {
+			       print $client "refused\n";
+			   }
+		       } else {
+			   print $client "refused\n";
+		       }
 # ------------------------------------------------------------------------ auth
                    } elsif ($userinput =~ /^auth/) {
 		     if ($wasenc==1) {
@@ -808,10 +875,18 @@ sub make_new_child {
 			     my $salt=time;
                              $salt=substr($salt,6,2);
 			     my $ncpass=crypt($npass,$salt);
-                             { my $pf = IO::File->new(">$passfilename");
- 	  		       print $pf "internal:$ncpass\n"; }             
-			     &logthis("Result of password change for $uname: pwchange_success");
-                             print $client "ok\n";
+                             {
+				 my $pf;
+				 if ($pf = IO::File->new(">$passfilename")) {
+				     print $pf "internal:$ncpass\n";
+				     &logthis("Result of password change for $uname: pwchange_success");
+				     print $client "ok\n";
+				 } else {
+				     &logthis("Unable to open $uname passwd to change password");
+				     print $client "non_authorized\n";
+				 }
+			     }             
+			     
                            } else {
                              print $client "non_authorized\n";
                            }
@@ -1733,6 +1808,19 @@ sub make_new_child {
                        }
                        if ($ulsout eq '') { $ulsout='empty'; }
                        print $client "$ulsout\n";
+# ----------------------------------------------------------------- setannounce
+                   } elsif ($userinput =~ /^setannounce/) {
+		       my ($cmd,$announcement)=split(/:/,$userinput);
+		       chomp($announcement);
+		       $announcement=&unescape($announcement);
+                       if (my $store=IO::File->new('>'.$perlvar{'lonDocRoot'}.
+						'/announcement.txt')) {
+			   print $store $announcement;
+                           close $store;
+			   print $client "ok\n";
+		       } else {
+			   print $client "error: ".($!+0)."\n";
+		       }
 # ------------------------------------------------------------------ Hanging up
                    } elsif (($userinput =~ /^exit/) ||
                             ($userinput =~ /^init/)) {
@@ -2105,8 +2193,8 @@ sub userload {
 	my $curtime=time;
 	while ($filename=readdir(LONIDS)) {
 	    if ($filename eq '.' || $filename eq '..') {next;}
-	    my ($atime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[8];
-	    if ($curtime-$atime < 3600) { $numusers++; }
+	    my ($mtime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[9];
+	    if ($curtime-$mtime < 3600) { $numusers++; }
 	}
 	closedir(LONIDS);
     }