--- loncom/lond	2019/04/26 20:22:10	1.558
+++ loncom/lond	2020/05/05 20:24:41	1.563
@@ -2,7 +2,7 @@
 # The LearningOnline Network
 # lond "LON Daemon" Server (port "LOND" 5663)
 #
-# $Id: lond,v 1.558 2019/04/26 20:22:10 raeburn Exp $
+# $Id: lond,v 1.563 2020/05/05 20:24:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,7 +65,7 @@ my $DEBUG = 0;		       # Non zero to ena
 my $status='';
 my $lastlog='';
 
-my $VERSION='$Revision: 1.558 $'; #' stupid emacs
+my $VERSION='$Revision: 1.563 $'; #' stupid emacs
 my $remoteVERSION;
 my $currenthostid="default";
 my $currentdomainid;
@@ -220,6 +220,7 @@ my %trust = (
                courseidput => {remote => 1, domroles => 1, enroll => 1},
                courseidputhash => {remote => 1, domroles => 1, enroll => 1},
                courselastaccess => {remote => 1, domroles => 1, enroll => 1},
+               coursesessions => {institutiononly => 1},
                currentauth => {remote => 1, domroles => 1, enroll => 1},
                currentdump => {remote => 1, enroll => 1},
                currentversion => {remote=> 1, content => 1},
@@ -227,6 +228,7 @@ my %trust = (
                dcmailput => {remote => 1, domroles => 1},
                del => {remote => 1, domroles => 1, enroll => 1, content => 1},
                delbalcookie => {institutiononly => 1},
+               delusersession => {institutiononly => 1},
                deldom => {remote => 1, domroles => 1}, # not currently used
                devalidatecache => {institutiononly => 1},
                domroleput => {remote => 1, enroll => 1},
@@ -2030,7 +2032,7 @@ sub read_lonnet_global {
                 }
                 if ($what eq 'perlvar') {
                     if (!exists($packagevars{$what}{'lonBalancer'})) {
-                        if ($dist =~ /^(centos|rhes|fedora|scientific)/) {
+                        if ($dist =~ /^(centos|rhes|fedora|scientific|oracle)/) {
                             my $othervarref=LONCAPA::Configuration::read_conf('httpd.conf');
                             if (ref($othervarref) eq 'HASH') {
                                 $items->{'lonBalancer'} = $othervarref->{'lonBalancer'};
@@ -2442,7 +2444,7 @@ sub change_password_handler {
 	    my $result = &change_unix_password($uname, $npass);
             if ($result eq 'ok') {
                 &update_passwd_history($uname,$udom,$howpwd,$context);
-             }
+            }
 	    &logthis("Result of password change for $uname: ".
 		     $result);
 	    &Reply($client, \$result, $userinput);
@@ -3033,6 +3035,54 @@ sub user_has_session_handler {
 }
 &register_handler("userhassession", \&user_has_session_handler, 0,1,0);
 
+sub del_usersession_handler {
+    my ($cmd, $tail, $client) = @_;
+
+    my $result;
+    my ($udom, $uname) = map { &unescape($_) } (split(/:/, $tail));
+    if (($udom =~ /^$LONCAPA::match_domain$/) && ($uname =~ /^$LONCAPA::match_username$/)) {
+        my $lonidsdir = $perlvar{'lonIDsDir'};
+        if (-d $lonidsdir) {
+            if (opendir(DIR,$lonidsdir)) {
+                my $filename;
+                while ($filename=readdir(DIR)) {
+                    if ($filename=~/^\Q$uname\E_\d+_\Q$udom\E_/) {
+                        if (tie(my %oldenv,'GDBM_File',"$lonidsdir/$filename",
+                                &GDBM_READER(),0640)) {
+                            my $linkedfile;
+                            if (exists($oldenv{'user.linkedenv'})) {
+                                $linkedfile = $oldenv{'user.linkedenv'};
+                            }
+                            untie(%oldenv);
+                            $result = unlink("$lonidsdir/$filename");
+                            if ($result) {
+                                if ($linkedfile =~ /^[a-f0-9]+_linked$/) {
+                                    if (-l "$lonidsdir/$linkedfile.id") {
+                                        unlink("$lonidsdir/$linkedfile.id");
+                                    }
+                                }
+                            }
+                        } else {
+                            $result = unlink("$lonidsdir/$filename");
+                        }
+                        last;
+                    }
+                }
+            }
+        }
+        if ($result == 1) {
+            &Reply($client, "$result\n", "$cmd:$tail");
+        } else {
+            &Reply($client, "not_found\n", "$cmd:$tail");
+        }
+    } else {
+        &Failure($client, "invalid_user\n", "$cmd:$tail");
+    }
+    return 1;
+}
+
+&register_handler("delusersession", \&del_usersession_handler, 0,1,0);
+
 #
 #  Authenticate access to a user file by checking that the token the user's 
 #  passed also exists in their session file
@@ -4824,6 +4874,44 @@ sub course_lastaccess_handler {
 }
 &register_handler("courselastaccess",\&course_lastaccess_handler, 0, 1, 0);
 
+sub course_sessions_handler {
+    my ($cmd, $tail, $client) = @_;
+    my $userinput = "$cmd:$tail";
+    my ($cdom,$cnum,$lastactivity) = split(':',$tail);
+    my $dbsuffix = '_'.$cdom.'_'.$cnum.'.db';
+    my (%sessions,$qresult);
+    my $now=time;
+    if (opendir(DIR,$perlvar{'lonIDsDir'})) {
+        my $filename;
+        while ($filename=readdir(DIR)) {
+            next if ($filename=~/^\./);
+            next if ($filename=~/^publicuser_/);
+            next if ($filename=~/^[a-f0-9]+_(linked|lti_\d+)\.id$/);
+            if ($filename =~ /^($LONCAPA::match_username)_\d+_($LONCAPA::match_domain)_/) {
+                my ($uname,$udom) = ($1,$2);
+                next unless (-e "$perlvar{'lonDaemons'}/tmp/$uname$dbsuffix");
+                my $mtime = (stat("$perlvar{'lonIDsDir'}/$filename"))[9];
+                if ($lastactivity < 0) {
+                    next if ($mtime-$now > $lastactivity);
+                } else {
+                    next if ($now-$mtime > $lastactivity);
+                }
+                $sessions{$uname.':'.$udom} = $mtime;
+            }
+        }
+        closedir(DIR); 
+    }
+    foreach my $user (keys(%sessions)) {
+        $qresult.=&escape($user).'='.$sessions{$user}.'&';
+    }
+    if ($qresult) {
+        chop($qresult);
+    }
+    &Reply($client, \$qresult, $userinput);
+    return 1;
+}
+&register_handler("coursesessions",\&course_sessions_handler, 0, 1, 0);
+
 #
 # Puts an unencrypted entry in a namespace db file at the domain level 
 #
@@ -7542,7 +7630,7 @@ sub make_new_child {
         &Authen::Krb5::init_context();
 
         my $no_ets;
-        if ($dist =~ /^(?:centos|rhes|scientific)(\d+)$/) {
+        if ($dist =~ /^(?:centos|rhes|scientific|oracle)(\d+)$/) {
             if ($1 >= 7) {
                 $no_ets = 1;
             }