Changeset 1350 for trunk/wifidog-auth/wifidog/classes/Authenticator.php

Timestamp:

06/10/08 00:25:06 (4 years ago)

Author:

benoitg

Message:

• Begin implementing http://dev.wifidog.org/wiki/doc/developer/TokenArchitecture. This is a first step: necessary SQL schema changes, and adapt the current functionnality to the new schema to have a baseline. Everything should work as before, please notify me if you notice anything strange...

Files:

• trunk/wifidog-auth/wifidog/classes/Authenticator.php (modified) (5 diffs)

trunk/wifidog-auth/wifidog/classes/Authenticator.php

@@ -229 +229 @@
             if ($splash_user_id != $user->getId() && $node = Node::getCurrentNode()) {
                 // Try to destroy all connections tied to the current node
-                $sql = "SELECT conn_id FROM connections WHERE user_id = '{$user->getId()}' AND node_id='{$node->getId()}' AND token_status='".TOKEN_INUSE."';";
+                $sql = "SELECT conn_id FROM connections JOIN tokens USING (token_id) WHERE user_id = '{$user->getId()}' AND node_id='{$node->getId()}' AND token_status='".TOKEN_INUSE."';";
                 $conn_rows = null;
                 $db->execSql($sql, $conn_rows, false);
@@ -247 +247 @@
              * that all other active tokens should expire
              */
-            $sql = "SELECT conn_id FROM connections WHERE user_id = '{$user->getId()}' AND token_status='".TOKEN_INUSE."';";
+            $sql = "SELECT conn_id FROM connections JOIN tokens USING (token_id) WHERE user_id = '{$user->getId()}' AND token_status='".TOKEN_INUSE."';";
             $conn_rows = null;
             $db->execSql($sql, $conn_rows, false);
@@ -285 +285 @@
         $mac = $db->escapeString($_REQUEST['mac']);
         $ip = $db->escapeString($_REQUEST['ip']);
-        $sql = "UPDATE connections SET token_status='".TOKEN_INUSE."',user_mac='$mac',user_ip='$ip',last_updated=CURRENT_TIMESTAMP WHERE conn_id='{$conn_id}';";
+        $sql = "BEGIN;\n";
+        $sql .= "UPDATE connections SET user_mac='$mac',user_ip='$ip',last_updated=CURRENT_TIMESTAMP WHERE conn_id='{$conn_id}';";
+        $sql .= "UPDATE tokens SET token_status='".TOKEN_INUSE."' FROM connections WHERE connections.token_id=tokens.token_id AND conn_id='{$conn_id}';";
+        $sql .= "COMMIT;\n";
+        
         $db->execSqlUpdate($sql, false);
 
@@ -295 +299 @@
              */
             $token = $db->escapeString($_REQUEST['token']);
-            $sql = "SELECT * FROM connections WHERE user_id = '{$info['user_id']}' AND token_status='".TOKEN_INUSE."' AND token!='$token';";
+            $sql = "SELECT * FROM connections JOIN tokens USING (token_id) WHERE user_id = '{$info['user_id']}' AND token_status='".TOKEN_INUSE."' AND token_id!='$token';";
             $conn_rows = array ();
             $db->execSql($sql, $conn_rows, false);
@@ -305 +309 @@
             }
         }
-
-        /*
-         * Delete all unused tokens for this user, so we don't fill the database
-         * with them
-         */
-        $sql = "DELETE FROM connections "."WHERE token_status='".TOKEN_UNUSED."' AND user_id = '{$info['user_id']}';";
-        $db->execSqlUpdate($sql, false);
     }