--- loncom/loncron	2018/12/22 20:05:16	1.116
+++ loncom/loncron	2020/05/09 19:17:33	1.124
@@ -2,7 +2,7 @@
 
 # Housekeeping program, started by cron, loncontrol and loncron.pl
 #
-# $Id: loncron,v 1.116 2018/12/22 20:05:16 raeburn Exp $
+# $Id: loncron,v 1.124 2020/05/09 19:17:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,6 +45,9 @@ use Getopt::Long;
 use GDBM_File;
 use Storable qw(thaw);
 use File::ReadBackwards;
+use File::Copy;
+use Sys::Hostname::FQDN();
+
 #globals
 use vars qw (%perlvar %simplestatus $errors $warnings $notices $totalcount);
 
@@ -494,19 +497,38 @@ sub clean_lonIDs {
     my $cleaned=0;
     my $active=0;
     while (my $fname=<$perlvar{'lonIDsDir'}/*>) {
-	my ($dev,$ino,$mode,$nlink,
-	    $uid,$gid,$rdev,$size,
-	    $atime,$mtime,$ctime,
-	    $blksize,$blocks)=stat($fname);
-	my $now=time;
-	my $since=$now-$mtime;
-	if ($since>$perlvar{'lonExpire'}) {
-	    $cleaned++;
-	    &log($fh,"Unlinking $fname<br />");
-	    unlink("$fname");
-	} else {
-	    $active++;
-	}
+        my $now=time;
+        if (-l $fname) {
+            my $linkfname = readlink($fname);
+            if (-f $linkfname) {
+                if ($linkfname =~ m{^$perlvar{'lonIDsDir'}/[^/]+\.id$}) {
+                    my @data = stat($linkfname);
+                    my $mtime = $data[9];
+                    my $since=$now-$mtime;
+                    if ($since>$perlvar{'lonExpire'}) {
+                        if (unlink($linkfname)) {
+                            $cleaned++;
+                            &log($fh,"Unlinking $linkfname<br />");
+                            unlink($fname);
+                        }
+                    }
+                }
+            } else {
+               unlink($fname);
+            }
+        } elsif (-f $fname) {
+            my @data = stat($fname);
+            my $mtime = $data[9];
+            my $since=$now-$mtime;
+            if ($since>$perlvar{'lonExpire'}) {
+                if (unlink($fname)) {
+                    $cleaned++;
+                    &log($fh,"Unlinking $fname<br />");
+                }
+            } else {
+                $active++;
+            }
+        }
     }
     &log($fh,"<p>Cleaned up ".$cleaned." stale session token(s).</p>");
     &log($fh,"<h3>$active open session(s)</h3>");
@@ -520,7 +542,7 @@ sub clean_balanceIDs {
     my $cleaned=0;
     my $active=0;
     if (-d $perlvar{'lonBalanceDir'}) {
-        while (my $fname=<$perlvar{'balanceDir'}/*.id>) {
+        while (my $fname=<$perlvar{'lonBalanceDir'}/*.id>) {
             my ($dev,$ino,$mode,$nlink,
                 $uid,$gid,$rdev,$size,
                 $atime,$mtime,$ctime,
@@ -566,6 +588,34 @@ sub clean_webDAV_sessionIDs {
     }
 }
 
+# ------------------------------------------------------------ clean out ltiIDs
+
+sub clean_ltiIDs {
+    my ($fh)=@_;
+    &log($fh,'<hr /><a name="ltisessions" /><h2>LTI Session Pointers</h2>');
+    my $cleaned=0;
+    my $active=0;
+    if (-d $perlvar{'ltiIDsDir'}) {
+        while (my $fname=<$perlvar{'ltiIDsDir'}/*>) {
+            my ($dev,$ino,$mode,$nlink,
+                $uid,$gid,$rdev,$size,
+                $atime,$mtime,$ctime,
+                $blksize,$blocks)=stat($fname);
+            my $now=time;
+            my $since=$now-$mtime;
+            if ($since>$perlvar{'lonExpire'}) {
+                $cleaned++;
+                &log($fh,"Unlinking $fname<br />");
+                unlink("$fname");
+            } else {
+                $active++;
+            }
+        }
+    }
+    &log($fh,"<p>Cleaned up ".$cleaned." old LTI session pointers.</p>");
+    &log($fh,"<h3>$active unexpired LTI session pointers</h3>");
+}
+
 # ----------------------------------------------------------- clean out sockets
 sub clean_sockets {
     my ($fh)=@_;
@@ -1027,6 +1077,94 @@ sub write_checksums {
     return;
 }
 
+sub write_hostips {
+    my $lontabdir = $perlvar{'lonTabDir'};
+    my $defdom = $perlvar{'lonDefDomain'};
+    my $lonhost = $perlvar{'lonHostID'};
+    my $newfile = "$lontabdir/currhostips.tab";
+    my $oldfile = "$lontabdir/prevhostips.tab";
+    my (%prevhosts,%currhosts,%ipchange);
+    if ((-e $newfile) && (-s $newfile)) {
+        move($newfile,$oldfile);
+        chmod(0644,$oldfile);
+        if (open(my $fh,'<',$oldfile)) {
+            while (my $line=<$fh>) {
+                chomp($line);
+                if ($line =~ /^([^:]+):([\d.]+)$/) {
+                    $prevhosts{$1} = $2;
+                }
+            }
+            close($fh);
+        }
+    }
+    my ($ip_info,$cached) =
+        &Apache::lonnet::is_cached_new('iphost','iphost');
+    if (!$cached) {
+        &Apache::lonnet::get_iphost();
+        ($ip_info,$cached) =
+        &Apache::lonnet::is_cached_new('iphost','iphost');
+    }
+    if (ref($ip_info) eq 'ARRAY') {
+        %currhosts = %{$ip_info->[1]};
+        if (open(my $fh,'>',$newfile)) {
+            foreach my $key (keys(%currhosts)) {
+                print $fh "$key:$currhosts{$key}\n";
+            }
+            close($fh);
+            chmod(0644,$newfile);
+        }
+    }
+    if (keys(%prevhosts) && keys(%currhosts)) {
+        foreach my $key (keys(%prevhosts)) {
+            unless ($currhosts{$key} eq $prevhosts{$key}) {
+                $ipchange{$key} = $prevhosts{$key}.' | '.$currhosts{$key};
+            }
+        }
+        foreach my $key (keys(%currhosts)) {
+            unless ($currhosts{$key} eq $prevhosts{$key}) {
+                $ipchange{$key} = $prevhosts{$key}.' | '.$currhosts{$key};
+            }
+        }
+    }
+    if (&Apache::lonnet::domain($defdom,'primary') eq $lonhost) {
+        if (keys(%ipchange)) {
+            if (open(my $fh,'>>',$perlvar{'lonDaemons'}.'/logs/hostip.log')) {
+               print $fh "********************\n".localtime(time).' Changes --'."\n".
+                         "| Hostname | Previous IP | New IP |\n".
+                         " --------------------------------- \n";
+               foreach my $hostname (sort(keys(%ipchange))) {
+                    print $fh "| $hostname | $ipchange{$hostname} |\n";
+                }
+                print $fh "\n*******************\n\n";
+                close($fh);
+            }
+            my $emailto = &Apache::loncommon::build_recipient_list(undef,
+                                   'hostipmail',$defdom);
+            if ($emailto) {
+                my $subject = "LON-CAPA Hostname to IP change ($perlvar{'lonHostID'})";
+                my $chgmail = "To: $emailto\n".
+                              "Subject: $subject\n".
+                              "Content-type: text/plain\; charset=UTF-8\n".
+                              "MIME-Version: 1.0\n\n".
+                              "Host/IP changes\n".
+                              " \n".
+                              "| Hostname | Previous IP | New IP |\n".
+                              " --------------------------------- \n";
+                foreach my $hostname (sort(keys(%ipchange))) {
+                    $chgmail .= "| $hostname | $ipchange{$hostname} |\n";
+                }
+                $chgmail .= "\n\n";
+                if (open(my $mailh, "|/usr/lib/sendmail -oi -t -odb")) {
+                    print $mailh $chgmail;
+                    close($mailh);
+                    print "Sending mail notification of hostname/IP changes.\n";
+                }
+            }
+        }
+    }
+    return;
+}
+
 sub clean_nosslverify {
     my ($fh) = @_;
     my %unlinked; 
@@ -1397,19 +1535,23 @@ Options:
 				do not send emails do not
                                 check if the daemons are running, do not
                                 generate lon-status
-                           
+   --justiptables          Only update the dynamic iptables rules for the
+                                lond port; do not send emails, do not
+                                check if the daemons are running, do not
+                                generate lon-status
 USAGE
 }
 
 # ================================================================ Main Program
 sub main () {
     my ($help,$justcheckdaemons,$noemail,$justcheckconnections,
-	$justreload);
+	$justreload,$justiptables);
     &GetOptions("help"                 => \$help,
 		"justcheckdaemons"     => \$justcheckdaemons,
 		"noemail"              => \$noemail,
 		"justcheckconnections" => \$justcheckconnections,
-		"justreload"           => \$justreload
+		"justreload"           => \$justreload,
+                "justiptables"         => \$justiptables
 		);
     if ($help) { &usage(); return; }
 # --------------------------------- Read loncapa_apache.conf and loncapa.conf
@@ -1424,9 +1566,10 @@ sub main () {
     if ('{[[[[lonHostID]]]]}' eq $perlvar{'lonHostID'}) {
 	print("Unconfigured machine.\n");
 	my $emailto=$perlvar{'lonSysEMail'};
-	my $hostname=`/bin/hostname`;
-	chop $hostname;
-	$hostname=~s/[^\w\.]//g; # make sure is safe to pass through shell
+	my $hostname = Sys::Hostname::FQDN::fqdn();
+	$hostname=~s/\.+/./g;
+	$hostname=~s/\-+/-/g;
+	$hostname=~s/[^\w\.-]//g; # make sure is safe to pass through shell
 	my $subj="LON: Unconfigured machine $hostname";
 	system("echo 'Unconfigured machine $hostname.' |".
                " mail -s '$subj' $emailto > /dev/null");
@@ -1459,9 +1602,11 @@ sub main () {
             }
         }
     }
-    &Apache::lonnet::load_hosts_tab(1,$nomemcache);
-    &Apache::lonnet::load_domain_tab(1,$nomemcache);
-    &Apache::lonnet::get_iphost(1,$nomemcache);
+    if (!$justiptables) {
+        &Apache::lonnet::load_hosts_tab(1,$nomemcache);
+        &Apache::lonnet::load_domain_tab(1,$nomemcache);
+        &Apache::lonnet::get_iphost(1,$nomemcache);
+    }
 
 # ----------------------------------------- Force firewall update for lond port  
 
@@ -1492,7 +1637,7 @@ sub main () {
 
 	
     my $fh;
-    if (!$justcheckdaemons && !$justcheckconnections && !$justreload) {
+    if (!$justcheckdaemons && !$justcheckconnections && !$justreload && !$justiptables) {
 	$fh=&start_logging();
 
 	&log_machine_info($fh);
@@ -1500,11 +1645,12 @@ sub main () {
 	&clean_lonIDs($fh);
         &clean_balanceIDs($fh);
         &clean_webDAV_sessionIDs($fh);
+        &clean_ltiIDs($fh);
 	&check_httpd_logs($fh);
 	&rotate_lonnet_logs($fh);
 	&rotate_other_logs($fh);
     }
-    if (!$justcheckconnections && !$justreload) {
+    if (!$justcheckconnections && !$justreload && !$justiptables) {
 	&checkon_daemon($fh,'lonmemcached',40000);
 	&checkon_daemon($fh,'lonsql',200000);
 	if ( &checkon_daemon($fh,'lond',40000,'USR1') eq 'running') {
@@ -1525,7 +1671,7 @@ sub main () {
     if ($justcheckconnections) {
 	&test_connections($fh);
     }
-    if (!$justcheckdaemons && !$justcheckconnections && !$justreload) {
+    if (!$justcheckdaemons && !$justcheckconnections && !$justreload && !$justiptables) {
         my $domconf = &get_domain_config();
         my ($threshold,$sysmail,$reportstatus,$weightsref,$exclusionsref) =
             &get_permcount_settings($domconf);
@@ -1533,6 +1679,7 @@ sub main () {
         &write_loncaparevs();
         &write_serverhomeIDs();
 	&write_checksums();
+        &write_hostips();
         my %sslrem = &clean_nosslverify($fh);
         my %conchgs = &write_connection_config();
         my %hosttypechgs = &write_hosttypes();