Changeset 1350

Timestamp:

06/10/08 00:25:06 (4 months 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/CHANGELOG (modified) (1 diff)
• trunk/wifidog-auth/wifidog/admin/online_users.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/auth/index.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/classes/Authenticator.php (modified) (5 diffs)
• trunk/wifidog-auth/wifidog/classes/Network.php (modified) (2 diffs)
• trunk/wifidog-auth/wifidog/classes/Node.php (modified) (2 diffs)
• trunk/wifidog-auth/wifidog/classes/Statistics.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/classes/User.php (modified) (2 diffs)
• trunk/wifidog-auth/wifidog/include/common.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/include/schema_validate.php (modified) (2 diffs)

trunk/wifidog-auth/CHANGELOG

@@ -1 +1 @@
-# $Id$
+2008-06-10 Benoit Grégoire  <bock@step.polymtl.ca>
+        * Begin implementing http://dev.wifidog.org/wiki/doc/developer/TokenArchitecture.  This is a first step:  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...
+
-2008-04-27 Benoit Grégoire  <bock@step.polymtl.ca>
-        * Fixed dependencies on simplepie.  Simplepie removed a stable branch from their SVN.  Why on earth would one do that!?!?

trunk/wifidog-auth/wifidog/admin/online_users.php

@@ -55 +55 @@
-$smarty = SmartyWifidog::getObject();
-$online_users = null;
-connections,users,nodes
+users,nodes,connections JOIN tokens USING (token_id)
-$smarty->assign("users_array", $online_users);
-

trunk/wifidog-auth/wifidog/auth/index.php

@@ -61 +61 @@
-}
-
-users ON (users.user_id=connections.user_id) JOIN networks ON (users.account_origin = networks.network_id) WHERE connections.token
+tokens USING (token_id) JOIN users ON (users.user_id=connections.user_id) JOIN networks ON (users.account_origin = networks.network_id) WHERE connections.token_id
-
-if ($info != null)

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
-
+JOIN tokens USING (token_id) 
-                $conn_rows = null;
-                $db->execSql($sql, $conn_rows, false);
@@ -247 +247 @@
-             * that all other active tokens should expire
-             */
-
+JOIN tokens USING (token_id) 
-            $conn_rows = null;
-            $db->execSql($sql, $conn_rows, false);
@@ -285 +285 @@
-        $mac = $db->escapeString($_REQUEST['mac']);
-        $ip = $db->escapeString($_REQUEST['ip']);
-
+
+
+
+
+
-        $db->execSqlUpdate($sql, false);
-
@@ -295 +299 @@
-             */
-            $token = $db->escapeString($_REQUEST['token']);
-WHERE user_id = '{$info['user_id']}' AND token_status='".TOKEN_INUSE."' AND token
+JOIN tokens USING (token_id) WHERE user_id = '{$info['user_id']}' AND token_status='".TOKEN_INUSE."' AND token_id
-            $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);
-    }
-

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

@@ -1079 +1079 @@
-    {
-        $username = 'SPLASH_ONLY_USER';
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-        return $user;
@@ -1217 +1223 @@
-            $network_id = $db->escapeString($this->_id);
-            $splashOnlyUserId = $this->getSplashOnlyUser()->getId();
-NATURAL JOIN nodes JOIN networks ON (nodes.network_id=networks.network_id AND networks.network_id='$network_id') WHERE connections.token_status='".TOKEN_INUSE."' AND users.user_id=connections.user_id AND users.user_id!='{$splashOnlyUserId}') + (SELECT COUNT(DISTINCT connections.user_mac) as count FROM users,connections NATURAL JOIN nodes JOIN networks ON (nodes.network_id=networks.network_id AND networks.network_id='$network_id') WHERE connectio
+JOIN tokens USING (token_id) NATURAL JOIN nodes JOIN networks ON (nodes.network_id=networks.network_id AND networks.network_id='$network_id') WHERE tokens.token_status='".TOKEN_INUSE."' AND users.user_id=connections.user_id AND users.user_id!='{$splashOnlyUserId}') + (SELECT COUNT(DISTINCT connections.user_mac) as count FROM users,connections JOIN tokens USING (token_id) NATURAL JOIN nodes JOIN networks ON (nodes.network_id=networks.network_id AND networks.network_id='$network_id') WHERE toke
-            $db->execSqlUniqueRes($sql, $row, false);
-

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

@@ -1543 +1543 @@
-
-    private function getOnlineUsersSql() {
-WHERE connectio
+JOIN tokens USING (token_id) WHERE toke
-    }
-    /**
@@ -1585 +1585 @@
-        $row = null;
-        $splashOnlyUserId = $this->getNetwork()->getSplashOnlyUser()->getId();
-WHERE connections.token_status='".TOKEN_INUSE."' AND users.user_id=connections.user_id AND connections.node_id='{$this->id}' AND users.user_id!='{$splashOnlyUserId}') + (SELECT COUNT(DISTINCT connections.user_mac) as count FROM users,connections WHERE connectio
+JOIN tokens USING (token_id) WHERE tokens.token_status='".TOKEN_INUSE."' AND users.user_id=connections.user_id AND connections.node_id='{$this->id}' AND users.user_id!='{$splashOnlyUserId}') + (SELECT COUNT(DISTINCT connections.user_mac) as count FROM users,connections JOIN tokens USING (token_id) WHERE toke
-        $db->execSqlUniqueRes($sql, $row, false);
-

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

@@ -322 +322 @@
-
-        $sql .= "FROM connections  \n";
+        $sql .= "JOIN tokens USING (token_id) \n";
-        $sql .= "JOIN nodes ON (connections.node_id = nodes.node_id) \n";
-        $sql .= "$join_users_sql \n";

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

@@ -152 +152 @@
-     * @param $username The username of the user
-     * @param $account_origin Network:  The account origin
-s
+f
-     * @return a User object, or null if there was an error
-     */
@@ -536 +536 @@
-                //echo "$session && $node_ip && {$session->get(SESS_NODE_ID_VAR)}";
-                $node_id = $db->escapeString($session->get(SESS_NODE_ID_VAR));
-
+
+
+
+
+
+
+
+
+
+
+
-                $retval = $token;
-            } else

trunk/wifidog-auth/wifidog/include/common.php

@@ -172 +172 @@
-    // 10 minutes
-    $expiration = '10 minutes';
-connections SET token_status='" . TOKEN_USED . "' WHERE
+tokens SET token_status='" . TOKEN_USED . "' FROM connections WHERE connections.token_id=tokens.token_id AND
-}
-

trunk/wifidog-auth/wifidog/include/schema_validate.php

@@ -48 +48 @@
- * Define current database schema version
- */
-59
+60
-/** Used to test a new shecma version before modyfying the database */
-define('SCHEMA_UPDATE_TEST_MODE', false);
@@ -1320 +1320 @@
-        $sql .= "CREATE INDEX idx_nodes_node_deployment_status ON nodes (node_deployment_status);\n";
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /*
-     $new_schema_version = ;