Changeset 1455

Timestamp:

03/03/10 19:27:35 (2 years ago)

Author:

gbastien

Message:

* Modifs on the token architecture: some corrections to connection and token deletions and garbage collection because token are now reusable

Location:

branches/newtoken/wifidog

Files:

• auth/index.php (modified) (1 diff)
• classes/Node.php (modified) (1 diff)
• classes/Statistics.php (modified) (2 diffs)
• classes/Token.php (modified) (2 diffs)
• include/common.php (modified) (1 diff)
• ws/classes/WifidogWS/V1.php (modified) (5 diffs)

branches/newtoken/wifidog/auth/index.php

@@ -118 +118 @@
             }
             else if ($info['token_status'] == TOKEN_INUSE &&
-                $info['gw_id'] && isset($_REQUEST['gw_id']) && $info['gw_id'] == $_REQUEST['gw_id'] &&
-                $info['user_mac'] && isset($_REQUEST['mac']) && $info['user_mac'] == $_REQUEST['mac'] &&
-                $info['user_ip'] && isset($_REQUEST['ip']) && $info['user_ip'] == $_REQUEST['ip'])
+                isset($info['gw_id']) && isset($_REQUEST['gw_id']) && $info['gw_id'] == $_REQUEST['gw_id'] &&
+                isset($info['user_mac']) && isset($_REQUEST['mac']) && $info['user_mac'] == $_REQUEST['mac'] &&
+                isset($info['user_ip']) && isset($_REQUEST['ip']) && $info['user_ip'] == $_REQUEST['ip'])
             {
                 // This solves the bug where the user clicks twice before getting the portal page

branches/newtoken/wifidog/classes/Node.php

@@ -1666 +1666 @@
 
     private function getOnlineUsersSql() {
-        return "SELECT users.user_id FROM users,connections JOIN tokens USING (token_id) WHERE tokens.token_status='".TOKEN_INUSE."' AND users.user_id=connections.user_id AND connections.node_id='{$this->id}'";
+        return "SELECT DISTINCT users.user_id FROM users,connections JOIN tokens USING (token_id) WHERE tokens.token_status='".TOKEN_INUSE."' AND users.user_id=connections.user_id AND connections.node_id='{$this->id}'";
+        
     }
     /**

branches/newtoken/wifidog/classes/Statistics.php

@@ -376 +376 @@
             throw new Exception(_('Access denied!'));
         } else
-        if ((!$user->DEPRECATEDisSuperAdmin())) {
-            throw new Exception(_('Access denied!'));
-        }
+        //if ((!$user->DEPRECATEDisSuperAdmin())) {
+        //    throw new Exception(_('Access denied!'));
+        //}
 
         if ($user->DEPRECATEDisSuperAdmin()) {
@@ -384 +384 @@
         } else {
             $user_id = $db->escapeString($user->getId());
-            $sql_join = " JOIN node_stakeholders ON (nodes.node_id=node_stakeholders.node_id AND user_id='$user_id') ";
+            $sql_join = " JOIN node_stakeholders ON (nodes.node_id=node_stakeholders.object_id AND user_id='$user_id') ";
         }
         $selectedNodes = $this->getSelectedNodes();
         $sql = "SELECT nodes.node_id, nodes.name from nodes $sql_join WHERE 1=1 ORDER BY lower(nodes.node_id)";
         $userData['preSelectedObjects']=$selectedNodes;
-                $userData['sqlJoin']=$sql_join;
+                $userData['additionalJoin']=$sql_join;
                                 $userData['typeInterface']="select_multiple";
         $html .= Node :: getSelectUI($name, $userData);

branches/newtoken/wifidog/classes/Token.php

@@ -96 +96 @@
                  * Delete all unused tokens for this user, so we don't fill the database
                  * with them
+                 * But make sure the unused token is not associated with previous successful connections, so when the incoming field is null
                  */
-                $sql = "DELETE FROM connections USING tokens "."WHERE tokens.token_id=connections.token_id AND token_status='".TOKEN_UNUSED."' AND user_id = '".$user->getId()."';\n";
+                $sql = "DELETE FROM connections USING tokens "."WHERE tokens.token_id=connections.token_id AND token_status='".TOKEN_UNUSED."' AND incoming is null AND user_id = '".$user->getId()."';\n";
                 $db->execSqlUpdate($sql, false);
 
@@ -116 +117 @@
                     // look for an existing token that can be reused
                     // get all unexpired tokens ordered by first used time
+                    // TODO: The token may be owned by someone but be unused and have no connection associated with it
                     $sql =  "SELECT t.token_id, tt.token_max_total_data, tt.token_max_incoming_data, tt.token_max_outgoing_data, 
                                                                 LEAST((c.first_used_time + tt.token_max_usage_duration - c.total_connection_duration), 

branches/newtoken/wifidog/include/common.php

@@ -182 +182 @@
     $sql = null;
     $sql .= "BEGIN;\n"; 
-    $sql .= "UPDATE connections SET logout_reason=" . LOGOUT_REASON_GARBAGE_COLLECTED . ", timestamp_out=(CURRENT_TIMESTAMP - interval '$expiration') FROM tokens WHERE connections.token_id=tokens.token_id AND last_updated < (CURRENT_TIMESTAMP - interval '$expiration') AND token_status = '" . TOKEN_INUSE . "';";
-    $sql .= "UPDATE tokens SET token_status='" . TOKEN_USED . "' FROM connections WHERE connections.token_id=tokens.token_id AND last_updated < (CURRENT_TIMESTAMP - interval '$expiration') AND token_status = '" . TOKEN_INUSE . "';";
+    $sql .= "UPDATE connections SET logout_reason=" . LOGOUT_REASON_GARBAGE_COLLECTED . ", timestamp_out=(CURRENT_TIMESTAMP - interval '$expiration') FROM tokens WHERE connections.token_id=tokens.token_id AND timestamp_out is null AND last_updated < (CURRENT_TIMESTAMP - interval '$expiration') AND token_status = '" . TOKEN_INUSE . "';";
+    $sql .= "UPDATE tokens SET token_status='" . TOKEN_USED . "' FROM (select token_id, max(last_updated) as last_updated from connections group by token_id) conn WHERE conn.token_id=tokens.token_id AND last_updated < (CURRENT_TIMESTAMP - interval '$expiration') AND token_status = '" . TOKEN_INUSE . "';";
     $sql .= "COMMIT;\n";
     $db->execSqlUpdate($sql, false);

branches/newtoken/wifidog/ws/classes/WifidogWS/V1.php

@@ -103 +103 @@
                         'NumOnlineUsers' => 'NumOnlineUsers',
                         'CreationDate' => 'CreationDate',
-                        'Status' => 'Status',
+                        'Status' => 'DeploymentStatus',
                         'OpeningDate' => 'CreationDate', 
                                                                         'Connected_users' => 'OnlineUsers'),
@@ -150 +150 @@
         foreach($infields as $field) {
             if (isset(self::$_allowedFields[$objectClass][$field]))
-                $fields[] = self::$_allowedFields[$objectClass][$field];
+                $fields[$field] = self::$_allowedFields[$objectClass][$field];
             else
-                $fields[] = "$field.forbidden";
+                $fields[$field] = "$field.forbidden";
         }
         return $fields;
@@ -298 +298 @@
         $fields = $this->mapFields($objectClass, $fields);
         if (empty($fields)) {
-            $fields = array_keys(self::$_allowedFields[$objectClass]);
+            $fields = self::$_allowedFields[$objectClass];
         } 
         $allowedFields = self::$_allowedFields[$objectClass];
@@ -362 +362 @@
         } 
 
+        if (!isset($objectList)) {
+            throw new WSException("Object list for '{$objectClass}' is not supported.", WSException::GENERIC_EXCEPTION);
+        }
         $this->_outputArr = self::filterRet($objectList, $fields);
     }
@@ -389 +392 @@
                     }
                     $retFields = array();
-                    foreach ($fields as $field) {
+                    foreach ($fields as $fkey => $field) {
                         $forbiddenfield = explode(".", $field);
                         if (! (count($forbiddenfield) == 2)) {
                             $methodName = 'get'.$field;
                             if (method_exists($value, $methodName)) {
-                                
-                                $retFields[$field] = self::filterRet($value->$methodName());
+                                $retFields[is_string($fkey)?$fkey:$field] = self::filterRet($value->$methodName());
                             } else {
-                                $retFields[$field] = 'unknown';
+                                $retFields[is_string($fkey)?$fkey:$field] = 'unknown';
                             }
                         } else