Changeset 1135

Timestamp:

11/23/06 10:11:15 (7 years ago)

Author:

benoitg

Message:

* Fix broken auth

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/classes/User.php (modified) (1 diff)
• wifidog/login/index.php (modified) (3 diffs)
• wifidog/node_list.php (modified) (1 diff)

trunk/wifidog-auth/CHANGELOG

@@ +1 @@
+2006-11-22 Benoit Grégoire  <bock@step.polymtl.ca>
+        * Fix broken auth
 2006-11-22 Benoit Grégoire  <bock@step.polymtl.ca>
         * Major schema update (this one is going to make your database grind for a while, sorry

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

@@ -446 +446 @@
                 $node_ip = $db->escapeString($_SERVER['REMOTE_ADDR']);
             }
-
-            if ($session && $node_ip && $session->get(SESS_GW_ID_VAR)) {
-                $node_id = $db->escapeString($session->get(SESS_GW_ID_VAR));
+            if ($session && $node_ip && $session->get(SESS_NODE_ID_VAR)) {
+                //echo "$session && $node_ip && {$session->get(SESS_NODE_ID_VAR)}";
+                $node_id = $db->escapeString($session->get(SESS_NODE_ID_VAR));
                 $db->execSqlUpdate("INSERT INTO connections (user_id, token, token_status, timestamp_in, node_id, node_ip, last_updated) VALUES ('" . $this->getId() . "', '$token', '" . TOKEN_UNUSED . "', CURRENT_TIMESTAMP, '$node_id', '$node_ip', CURRENT_TIMESTAMP)", false);
                 $retval = $token;

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

@@ -140 +140 @@
     $continueToAdmin = true;
 }
-
 /*
  * Start general request parameter processing section
@@ -149 +148 @@
         if($node)
         {
-            $session->set(SESS_NODE_ID_VAR, $node->getId);
+            $session->set(SESS_NODE_ID_VAR, $node->getId());
         }
     }
@@ -205 +204 @@
                                 // Login from a gateway, redirect to the gateway to activate the token
                                 $token = $user->generateConnectionToken();
-
+                if(!$token)
+                {
+                    throw new exception(sprintf(_("Unable to generate token for user %s"),$user->getUsername()));
+                }
+                else
+                {
                                 header("Location: http://" . $gw_address . ":" . $gw_port . "/wifidog/auth?token=" . $token);
+                }
                         } else {
                                 // Virtual login, redirect to the auth server homepage

trunk/wifidog-auth/wifidog/node_list.php

@@ -98 +98 @@
 // Sort according to above instructions
 if ($sort_by_using_sql === true)
-    $sql = "SELECT node_id, name, last_heartbeat_user_agent, (CURRENT_TIMESTAMP-last_heartbeat_timestamp) AS since_last_heartbeat, last_heartbeat_ip, CASE WHEN ((CURRENT_TIMESTAMP-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS online, creation_date, node_deployment_status FROM nodes WHERE node_deployment_status != 'PERMANENTLY_CLOSED' ORDER BY {$sort_by_param}";
+    $sql = "SELECT node_id, gw_id, name, last_heartbeat_user_agent, (CURRENT_TIMESTAMP-last_heartbeat_timestamp) AS since_last_heartbeat, last_heartbeat_ip, CASE WHEN ((CURRENT_TIMESTAMP-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS online, creation_date, node_deployment_status FROM nodes WHERE node_deployment_status != 'PERMANENTLY_CLOSED' ORDER BY {$sort_by_param}";
 else
-    $sql = "SELECT node_id, name, last_heartbeat_user_agent, (CURRENT_TIMESTAMP-last_heartbeat_timestamp) AS since_last_heartbeat, last_heartbeat_ip, CASE WHEN ((CURRENT_TIMESTAMP-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS online, creation_date, node_deployment_status FROM nodes WHERE node_deployment_status != 'PERMANENTLY_CLOSED' ORDER BY ".DEFAULT_SORT_BY_PARAM;
+    $sql = "SELECT node_id, gw_id, name, last_heartbeat_user_agent, (CURRENT_TIMESTAMP-last_heartbeat_timestamp) AS since_last_heartbeat, last_heartbeat_ip, CASE WHEN ((CURRENT_TIMESTAMP-last_heartbeat_timestamp) < interval '5 minutes') THEN true ELSE false END AS online, creation_date, node_deployment_status FROM nodes WHERE node_deployment_status != 'PERMANENTLY_CLOSED' ORDER BY ".DEFAULT_SORT_BY_PARAM;
 $nodes_results = null;
 $db->execSql($sql, $nodes_results, false);