Changeset 1413

Timestamp:

08/06/09 09:55:30 (4 years ago)

Author:

benoitg

Message:

• Experimental fix for #596

Location:

trunk/wifidog-auth/wifidog

Files:

• auth/index.php (modified) (1 diff)
• classes/User.php (modified) (1 diff)
• include/common.php (modified) (2 diffs)
• include/schema_validate.php (modified) (2 diffs)

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

@@ -159 +159 @@
                     else
                     {
-                        /* TODO:  This is a bit hackish, is't a shortcut untill the Token architecture uniform connection limit calculations are in place. */
+                        /* TODO:  This is a bit hackish, it's a shortcut untill the Token architecture uniform connection limit calculations are in place. */
                         $abuseControlFault = User::isAbuseControlViolated(User::getObject($info['user_id']), $info['user_mac'], Node::getObject($info['node_id']));
                         if($abuseControlFault) {

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

@@ -564 +564 @@
             $sql .= " SUM (CASE WHEN node_id = '".$node->getId()."' THEN (incoming+outgoing) END) AS node_total_bytes, \n";
             $sql .= " SUM (timestamp_out - timestamp_in) AS network_duration, \n";
-            $sql .= " SUM (CASE WHEN node_id = '".$node->getId()."' THEN (timestamp_out - timestamp_in) END) AS node_duration \n";//For real
+            $sql .= " SUM (CASE WHEN node_id = '".$node->getId()."' THEN (COALESCE(timestamp_out,last_updated) - timestamp_in) END) AS node_duration \n";//For real //The coalesce is to make sure the substraction returns a value for active conections, since active connections do not yet have a timestamp_out.  Do NOT coalesce with CURRENT_TIMESTAMP, it could cause real problems for users in case of gateway crash.
             $sql .= " FROM connections \n";//For real
             $sql .= " JOIN nodes USING (node_id) \n";

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

@@ -150 +150 @@
 define('ONLINE_STATUS_ONLINE', 1);
 define('ONLINE_STATUS_OFFLINE', 2);
+
 /* End Constant shared with the gateway*/
+
+/* Other constants */
+define('LOGOUT_REASON_GARBAGE_COLLECTED', 3);
+define('LOGOUT_REASON_UNKNOWN', 0);
+/* End of Other constants */
 
 /** Convert a password hash form a NoCat passwd file into the same format as get_password_hash().
@@ -172 +178 @@
     // 10 minutes
     $expiration = '10 minutes';
-    $db->execSqlUpdate("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 . "';", false);
+    $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 .= "COMMIT;\n";
+    $db->execSqlUpdate($sql, false);
 }
 

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

@@ -48 +48 @@
  * Define current database schema version
  */
-define('REQUIRED_SCHEMA_VERSION', 65);
+define('REQUIRED_SCHEMA_VERSION', 66);
 /** Used to test a new shecma version before modyfying the database */
 define('SCHEMA_UPDATE_TEST_MODE', false);
@@ -1442 +1442 @@
     }
     
+    $new_schema_version = 66;
+    if ($schema_version < $new_schema_version && $new_schema_version <= $targetSchema) {
+        printUpdateVersion($new_schema_version);
+        $sql .= "\n\nUPDATE schema_info SET value='$new_schema_version' WHERE tag='schema_version';\n";
+        $sql .= "UPDATE connections SET logout_reason=0, timestamp_out=timestamp_in FROM tokens WHERE connections.token_id=tokens.token_id AND timestamp_out IS NULL AND (token_status = 'USED' OR token_status = 'UNUSED');\n";
+    }
+    
     /*
      $new_schema_version = ;