Changes to allow users to be logged in from more then one browser.

The adminon/off bit is now kept in the login table instead of the
users table so that you can be reddot on a per-browser (login) basis.

sql/database-create.sql

@@ -1258,9 +1258,12 @@ CREATE TABLE log (
 
 CREATE TABLE login (
   uid varchar(10) NOT NULL default '',
-  hashkey tinytext,
+  hashkey varchar(64) NOT NULL default '',
+  hashhash varchar(64) NOT NULL default '',
   timeout varchar(10) NOT NULL default '',
-  PRIMARY KEY  (uid)
+  adminon tinyint(1) NOT NULL default '0',
+  PRIMARY KEY  (uid,hashkey),
+  UNIQUE KEY hashhash (uid,hashhash)
 ) TYPE=MyISAM;
 
 --

sql/database-migrate.txt

@@ -3404,3 +3404,22 @@ last_net_act,last_cpu_act,last_ext_act);
 
 4.67: Add a foreign_admin field to the users table for testbed-admins elsewhere.
        alter table users add column foreign_admin tinyint(4) default '0' after admin;
+
+4.68: Changes to the login table to allow users to be logged in from
+      more then one browser at a time.
+
+      drop table login;
+
+      CREATE TABLE login (
+        uid varchar(10) NOT NULL default '',
+        hashkey varchar(64) NOT NULL default '',
+        hashhash varchar(64) NOT NULL default '',
+        timeout varchar(10) NOT NULL default '',
+        adminon tinyint(1) NOT NULL default '0',
+        PRIMARY KEY  (uid,hashkey),
+        UNIQUE KEY hashhash (uid,hashhash)
+      ) TYPE=MyISAM;
+
+      This immediately logs everyone out from the web interface. but
+      thats not really a big deal.
+

sql/templates.sql

@@ -286,6 +286,8 @@ CREATE TABLE experiment_template_instances (
   stop_time datetime default NULL,
   -- The current experiment that is running (see below). One at a time!
   runidx int(10) unsigned default NULL,
+  -- The tag for the template at the time of instantiation.
+  template_tag varchar(64) default NULL,
   PRIMARY KEY  (idx),
   KEY  (exptidx),
   KEY  (parent_guid,parent_vers),

www/menu.php3

@@ -870,11 +870,11 @@ function PAGEHEADER($title, $view = NULL, $extra_headers = NULL) {
     echo "<h2 class='contenttitle'>\n";
     if ($login_uid && ISADMINISTRATOR()) {
 	if (ISADMIN($login_uid)) {
-	    echo "<a href=$TBBASE/toggle.php?target_uid=$login_uid&type=adminoff&value=1><img src='/redball.gif'
+	    echo "<a href=$TBBASE/toggle.php?target_uid=$login_uid&type=adminon&value=0><img src='/redball.gif'
                           border=0 alt='Admin On'></a>\n";
 	}
 	else {
-	    echo "<a href=$TBBASE/toggle.php?target_uid=$login_uid&type=adminoff&value=0><img src='/greenball.gif'
+	    echo "<a href=$TBBASE/toggle.php?target_uid=$login_uid&type=adminon&value=1><img src='/greenball.gif'
                           border=0 alt='Admin Off'></a>\n";
 	}
     }

www/showstuff.php3

@@ -493,7 +493,6 @@ function SHOWUSER($uid) {
     $usr_affil   = $row[usr_affil];
     $status      = $row[status];
     $admin       = $row[admin];
-    $adminoff    = $row[adminoff];
     $notes       = $row[notes];
     $frozen      = $row['weblogin_frozen'];
     $failcount   = $row['weblogin_failcount'];
@@ -635,13 +634,9 @@ function SHOWUSER($uid) {
     }
 
     if ($admin) {
-	$onoff = ($adminoff ? "Off" : "On");
-	$flip  = ($adminoff ? 0 : 1);
 	echo "<tr>
-              <td>Admin (on/off):</td>
-              <td>Yes
-              <a href=toggle.php?target_uid=$uid&type=adminoff&value=$flip>
-              ($onoff)</td>
+                  <td>Administrator:</td>
+                  <td>Yes</td>
               </tr>\n";
     }
     

www/tbauth.php3

@@ -41,7 +41,7 @@ define("CHECKLOGIN_FROZEN",		0x002000);
 define("CHECKLOGIN_ISADMIN",		0x004000);
 define("CHECKLOGIN_TRUSTED",		0x008000);
 define("CHECKLOGIN_CVSWEB",		0x010000);
-define("CHECKLOGIN_ADMINOFF",		0x020000);
+define("CHECKLOGIN_ADMINON",		0x020000);
 define("CHECKLOGIN_WEBONLY",		0x040000);
 define("CHECKLOGIN_PLABUSER",		0x080000);
 define("CHECKLOGIN_STUDLY",		0x100000);
@@ -148,6 +148,30 @@ function CHECKLOGIN($uid) {
     } else {
 	$curhash = $HTTP_COOKIE_VARS[$TBAUTHCOOKIE];
     }
+    $hashhash = $HTTP_COOKIE_VARS[$TBLOGINCOOKIE];
+
+    #
+    # We have to get at least one of the hashes. The Java applets do not
+    # send it, but web browsers will.
+    #
+    if (!isset($curhash) && !isset($hashhash)) {
+	$CHECKLOGIN_STATUS = CHECKLOGIN_NOTLOGGEDIN;
+	return $CHECKLOGIN_STATUS;
+    }
+    if (isset($curhash) &&
+	! preg_match("/^[\w]+$/", $curhash)) {
+	$CHECKLOGIN_STATUS = CHECKLOGIN_NOTLOGGEDIN;
+	return $CHECKLOGIN_STATUS;
+    }
+    if (isset($hashhash) &&
+	! preg_match("/^[\w]+$/", $hashhash)) {
+	$CHECKLOGIN_STATUS = CHECKLOGIN_NOTLOGGEDIN;
+	return $CHECKLOGIN_STATUS;
+    }
+    
+    $safe_curhash  = addslashes($curhash);
+    $safe_hashhash = addslashes($hashhash);
+    $safe_uid      = addslashes($uid);
     
     #
     # Note that we get multiple rows back because of the group_membership
@@ -155,14 +179,17 @@ function CHECKLOGIN($uid) {
     # 
     $query_result =
 	DBQueryFatal("select NOW()>=u.pswd_expires,l.hashkey,l.timeout, ".
-		     "       status,admin,cvsweb,g.trust,adminoff,webonly, " .
+		     "       status,admin,cvsweb,g.trust,l.adminon,webonly, " .
 		     "       user_interface,n.type,u.stud,u.wikiname, ".
 		     "       u.wikionly,g.pid,u.foreign_admin " .
 		     " from users as u ".
 		     "left join login as l on l.uid=u.uid ".
 		     "left join group_membership as g on g.uid=u.uid ".
-		     "left join nodetypeXpid_permissions as n on g.pid=n.pid " .
-		     "where u.uid='$uid'");
+		     "left join nodetypeXpid_permissions as n on g.pid=n.pid ".
+		     "where u.uid='$safe_uid' and ".
+		     (isset($curhash) ?
+		      "l.hashkey='$safe_curhash'" :
+		      "l.hashhash='$safe_hashhash'"));
 
     # No such user.
     if (! mysql_num_rows($query_result)) { 
@@ -189,7 +216,7 @@ function CHECKLOGIN($uid) {
 	    ! strcmp($row[6], "group_root")) {
 	    $trusted = 1;
 	}
-	$adminoff = $row[7];
+	$adminon  = $row[7];
 	$webonly  = $row[8];
 	$interface= $row[9];
 
@@ -222,7 +249,7 @@ function CHECKLOGIN($uid) {
     # Check for frozen account. Might do something interesting later.
     #
     if (! strcmp($status, TBDB_USERSTATUS_FROZEN)) {
-	DBQueryFatal("DELETE FROM login WHERE uid='$uid'");
+	DBQueryFatal("DELETE FROM login WHERE uid='$safe_uid'");
 	$CHECKLOGIN_STATUS = CHECKLOGIN_NOTLOGGEDIN;
 	return $CHECKLOGIN_STATUS;
     }
@@ -232,7 +259,7 @@ function CHECKLOGIN($uid) {
     # kill the entry anyway so the user is officially logged out.
     #
     if (time() > $timeout) {
-	DBQueryFatal("DELETE FROM login WHERE uid='$uid'");
+	DBQueryFatal("DELETE FROM login WHERE uid='$safe_uid'");
 	$CHECKLOGIN_STATUS = CHECKLOGIN_TIMEDOUT;
 	return $CHECKLOGIN_STATUS;
     }
@@ -277,8 +304,6 @@ function CHECKLOGIN($uid) {
 	# of the real hash, and simply tells us what menu to draw, but does
 	# not impart any privs!
 	#
-	$hashhash = $HTTP_COOKIE_VARS[$TBLOGINCOOKIE];
-	
 	if (isset($hashhash) &&
 	    $hashhash == bin2hex(mhash(MHASH_CRC32, $hashkey))) {
             #
@@ -302,8 +327,8 @@ function CHECKLOGIN($uid) {
 	$CHECKLOGIN_STATUS |= CHECKLOGIN_PSWDEXPIRED;
     if ($admin)
 	$CHECKLOGIN_STATUS |= CHECKLOGIN_ISADMIN;
-    if ($adminoff)
-	$CHECKLOGIN_STATUS |= CHECKLOGIN_ADMINOFF;
+    if ($adminon)
+	$CHECKLOGIN_STATUS |= CHECKLOGIN_ADMINON;
     if ($webonly)
 	$CHECKLOGIN_STATUS |= CHECKLOGIN_WEBONLY;
     if ($wikionly)
@@ -336,7 +361,7 @@ function CHECKLOGIN($uid) {
     # any processes we might spawn. We prepend an HTTP_ on the front of
     # the variable name, so that it will get through suexec.
     #
-    if ($admin && !$adminoff) {
+    if ($admin && $adminon) {
     	putenv("HTTP_WITH_TB_ADMIN_PRIVS=1");
     }
     # XXX Temporary.
@@ -448,8 +473,8 @@ function ISADMIN($uid = 1) {
     }
 
     return (($CHECKLOGIN_STATUS &
-	     (CHECKLOGIN_LOGGEDIN|CHECKLOGIN_ISADMIN|CHECKLOGIN_ADMINOFF)) ==
-	    (CHECKLOGIN_LOGGEDIN|CHECKLOGIN_ISADMIN));
+	     (CHECKLOGIN_LOGGEDIN|CHECKLOGIN_ISADMIN|CHECKLOGIN_ADMINON)) ==
+	    (CHECKLOGIN_LOGGEDIN|CHECKLOGIN_ISADMIN|CHECKLOGIN_ADMINON));
 }
 
 
@@ -518,6 +543,30 @@ function ISADMINISTRATOR() {
 	    (CHECKLOGIN_LOGGEDIN|CHECKLOGIN_ISADMIN));
 }
 
+#
+# Toggle current login admin bit. Must be an administrator of course!
+#
+function SETADMINMODE($uid, $onoff) {
+    global $HTTP_COOKIE_VARS, $TBAUTHCOOKIE;
+    
+    # This makes sure the user is actually logged in secure (https).
+    if (! ISADMINISTRATOR())
+	return;
+
+    $curhash = $HTTP_COOKIE_VARS[$TBAUTHCOOKIE];
+
+    if (!isset($curhash) ||
+	!preg_match("/^[\w]+$/", $curhash)) {
+	return;
+    }
+    $onoff   = addslashes($onoff);
+    $curhash = addslashes($curhash);
+    $uid     = addslashes($uid);
+    
+    DBQueryFatal("update login set adminon='$onoff' ".
+		 "where uid='$uid' and hashkey='$curhash'");
+}
+
 # Is this user a planetlab user? Returns 1 if they are, 0 if not.
 function ISPLABUSER() {
     global $CHECKLOGIN_STATUS;
@@ -682,21 +731,21 @@ function DOLOGIN($token, $password, $adminmode = 0) {
 	#
 
 	#
-	# Set adminoff on new logins, unless user requested to be
+	# Set adminmode off on new logins, unless user requested to be
 	# logged in as admin (and is an admin of course!). This is
 	# primarily to bypass the nologins directive which makes it
 	# impossible for an admin to login when the web interface is
 	# turned off. 
 	#
-	$adminoff = 1;
+	$adminon = 0;
 	if ($adminmode && $isadmin) {
-	    $adminoff = 0;
+	    $adminon = 1;
 	}
 
         #
         # Insert a record in the login table for this uid.
 	#
-	if (DOLOGIN_MAGIC($uid, $adminoff) < 0) {
+	if (DOLOGIN_MAGIC($uid, $adminon) < 0) {
 	    return -1;
 	}
 
@@ -760,7 +809,7 @@ function DOLOGIN($token, $password, $adminmode = 0) {
     return -1;
 }
 
-function DOLOGIN_MAGIC($uid, $adminoff = 1)
+function DOLOGIN_MAGIC($uid, $adminon = 0)
 {
     global $TBAUTHCOOKIE, $TBAUTHDOMAIN, $TBAUTHTIMEOUT;
     global $TBNAMECOOKIE, $TBLOGINCOOKIE, $TBSECURECOOKIES;
@@ -781,18 +830,10 @@ function DOLOGIN_MAGIC($uid, $adminoff = 1)
     #
     $timeout = $now + $TBAUTHTIMEOUT;
     $hashkey = GENHASH();
-    $query_result =
-	DBQueryFatal("SELECT timeout FROM login WHERE uid='$uid'");
-	
-    if (mysql_num_rows($query_result)) {
-	DBQueryFatal("UPDATE login set ".
-		     "timeout='$timeout', hashkey='$hashkey' ".
-		     "WHERE uid='$uid'");
-    }
-    else {
-	DBQueryFatal("INSERT into login (uid, hashkey, timeout) ".
-		     "VALUES ('$uid', '$hashkey', '$timeout')");
-    }
+    $crc     = bin2hex(mhash(MHASH_CRC32, $hashkey));
+
+    DBQueryFatal("replace into login (uid,hashkey,hashhash,timeout,adminon) ".
+		 "values ('$uid', '$hashkey', '$crc', '$timeout', $adminon)");
 
     #
     # Issue the cookie requests so that subsequent pages come back
@@ -815,7 +856,6 @@ function DOLOGIN_MAGIC($uid, $adminoff = 1)
     # All this does is change the menu options presented, imparting
     # no actual privs. 
     #
-    $crc = bin2hex(mhash(MHASH_CRC32, $hashkey));
     setcookie($TBLOGINCOOKIE, $crc, 0, "/", $TBAUTHDOMAIN, 0);
 
     #
@@ -850,7 +890,7 @@ function DOLOGIN_MAGIC($uid, $adminoff = 1)
 		  $TBAUTHDOMAIN, $TBSECURECOOKIES);
     }
 	
-    DBQueryFatal("update users set adminoff=$adminoff, ".
+    DBQueryFatal("update users set ".
 		 "       weblogin_failcount=0,weblogin_failstamp=0 ".
 		 "where uid='$uid'");
 
@@ -889,28 +929,40 @@ function VERIFYPASSWD($uid, $password) {
 #
 function DOLOGOUT($uid) {
     global $CHECKLOGIN_STATUS, $TBAUTHCOOKIE, $TBLOGINCOOKIE, $TBAUTHDOMAIN;
-    global $WIKISUPPORT, $WIKICOOKIENAME;
+    global $WIKISUPPORT, $WIKICOOKIENAME, $HTTP_COOKIE_VARS;
     global $BUGDBSUPPORT, $BUGDBCOOKIENAME;
 
     # Pedantic check.
     if (!TBvalid_uid($uid)) {
 	return 1;
     }
-
     $CHECKLOGIN_STATUS = CHECKLOGIN_NOTLOGGEDIN;
 
-    $query_result =
-	DBQueryFatal("SELECT hashkey timeout FROM login WHERE uid='$uid'");
-
-    # Not logged in.
-    if (($row = mysql_fetch_array($query_result)) == 0) {
+    $curhash = $HTTP_COOKIE_VARS[$TBAUTHCOOKIE];
+    $hashhash = $HTTP_COOKIE_VARS[$TBLOGINCOOKIE];
+    
+    #
+    # We have to get at least one of the hashes. 
+    #
+    if (!isset($curhash) && !isset($hashhash)) {
 	return 1;
     }
-
-    $hashkey = $row[hashkey];
-    $timeout = time() - 1000000;
-
-    DBQueryFatal("DELETE FROM login WHERE uid='$uid'");
+    if (isset($curhash) &&
+	! preg_match("/^[\w]+$/", $curhash)) {
+	return 1;
+    }
+    if (isset($hashhash) &&
+	! preg_match("/^[\w]+$/", $hashhash)) {
+	return 1;
+    }
+    $safe_curhash  = addslashes($curhash);
+    $safe_hashhash = addslashes($hashhash);
+
+    DBQueryFatal("delete from login ".
+		 " where uid='$uid' and ".
+		 (isset($curhash) ?
+		  "hashkey='$safe_curhash'" :
+		  "hashhash='$safe_hashhash'"));
 
     #
     # Issue a cookie request to delete the cookies. 

www/toggle.php

 <?php
 #
 # EMULAB-COPYRIGHT
-# Copyright (c) 2000-2003, 2005 University of Utah and the Flux Group.
+# Copyright (c) 2000-2003, 2005, 2006 University of Utah and the Flux Group.
 # All rights reserved.
 #
 include("defs.php3");
@@ -23,18 +23,18 @@ LOGGEDINORDIE($uid, CHECKLOGIN_USERSTATUS|CHECKLOGIN_WEBONLY);
 $isadmin = ISADMIN($uid);
 
 # List of valid toggles
-$toggles = array("adminoff", "webfreeze", "cvsweb", "lockdown",
+$toggles = array("adminon", "webfreeze", "cvsweb", "lockdown",
 		 "cvsrepo_public");
 
 # list of valid values for each toggle
-$values  = array("adminoff"       => array(0,1),
+$values  = array("adminon"        => array(0,1),
 		 "webfreeze"      => array(0,1),
 		 "cvsweb"         => array(0,1),
 		 "lockdown"       => array(0,1),
 		 "cvsrepo_public" => array(0,1));
 
 # list of valid extra variables for the each toggle, and mandatory flag.
-$optargs = array("adminoff"       => array("target_uid" => 0),
+$optargs = array("adminon"        => array(),
 		 "webfreeze"      => array("target_uid" => 1),
 		 "cvsweb"         => array("target_uid" => 1),
 		 "lockdown"       => array("pid" => 1, "eid" => 1),
@@ -72,20 +72,14 @@ while (list ($arg, $required) = each ($optargs[$type])) {
 #
 # Permissions checks, and do the toggle...
 #
-if ($type == "adminoff") {
+if ($type == "adminon") {
     # must be admin
     # Do not check if they are admin mode (ISADMIN), check if they
     # have the power to change to admin mode!
     if (! ($CHECKLOGIN_STATUS & CHECKLOGIN_ISADMIN) ) {
 	USERERROR("You do not have permission to toggle $type!", 1);
     }
-    # Admins can change status for other users.
-    if (!isset($target_uid))
-	$target_uid = $uid;
-    elseif (!TBCurrentUser($target_uid)) {
-	    PAGEARGERROR("Target user '$target_uid' is not a valid user!");
-    }
-    DBQueryFatal("update users set adminoff='$value' where uid='$target_uid'");
+    SETADMINMODE($uid, $value);
 }
 elseif ($type == "webfreeze") {
     # must be admin