Changeset 1434

Timestamp:

12/09/09 14:06:04 (2 years ago)

Author:

gbastien

Message:

* New code for node groups
* Login and signup and logout script now can do something with the mac address

Location:

branches/gbastien/wifidog

Files:

• classes/Dependency.php (modified) (1 diff)
• classes/MainUI.php (modified) (2 diffs)
• classes/Session.php (modified) (1 diff)
• classes/User.php (modified) (3 diffs)
• login/index.php (modified) (6 diffs)
• signup.php (modified) (1 diff)

branches/gbastien/wifidog/classes/Dependency.php

@@ -128 +128 @@
        'mandatory' => true,
        "type" => "localLib",
-       "detectFiles" => "lib/PHPMailer_v2.0.0/class.phpmailer.php",
+       "detectFiles" => "lib/PHPMailer_v5.1/class.phpmailer.php",
        'description' => "Required for sending mail",
        'website' => "http://phpmailer.codeworxtech.com/",
-       'installSourceUrl' => "http://superb-west.dl.sourceforge.net/sourceforge/phpmailer/PHPMailer_v2.0.0.tar.gz",
+       'installSourceUrl' => "http://iweb.dl.sourceforge.net/sourceforge/phpmailer/PHPMailer_v5.1.tar.gz",
        'installMethod' => "tarball",
        'installDestination' => "/"

branches/gbastien/wifidog/classes/MainUI.php

@@ -467 +467 @@
         $_gwAddress = null;
         $_gwPort = null;
+        $_mac = null;
         $_selected = "";
         $_languageChooser = array ();
@@ -499 +500 @@
             $_gwAddress = $session->get(SESS_GW_ADDRESS_VAR);
             $_gwPort = $session->get(SESS_GW_PORT_VAR);
+            $_mac = $session->get(SESS_USER_MAC_VAR);
 
             // If gateway information could be detected tell them to Smarty
             if ($_gwId && $_gwAddress && $_gwPort) {
-                $this->smarty->assign('logoutParameters', "&gw_id=" . $_gwId . "&gw_address=" . $_gwAddress . "&gw_port=" . $_gwPort);
+                $this->smarty->assign('logoutParameters', "&gw_id=" . $_gwId . "&gw_address=" . $_gwAddress . "&gw_port=" . $_gwPort . ($_mac? "&mac=".$_mac:""));
             }
         } else {

branches/gbastien/wifidog/classes/Session.php

@@ -45 +45 @@
 define('SESS_USERNAME_VAR', 'SESS_USERNAME');
 define('SESS_USER_ID_VAR', 'SESS_USER_ID');
+define('SESS_USER_MAC_VAR', 'SESS_USER_MAC');
 define('SESS_PASSWORD_HASH_VAR', 'SESS_PASSWORD_HASH');
 define('SESS_ORIGINAL_URL_VAR', 'SESS_ORIGINAL_URL');

branches/gbastien/wifidog/classes/User.php

@@ -639 +639 @@
     @return true on success, false on failure
     */
-    function generateConnectionToken() {
+    function generateConnectionToken($mac = null) {
         if ($this->isUserValid()) {
             $db = AbstractDb::getObject();
@@ -648 +648 @@
                 $node_ip = $db->escapeString($_SERVER['REMOTE_ADDR']);
             }
+            
             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));
-                $abuseControlFault = User::isAbuseControlViolated($this, null, Node::getObject($node_id));
+                $abuseControlFault = User::isAbuseControlViolated($this, $mac, Node::getObject($node_id));
                 if($abuseControlFault) {
                     throw new Exception ($abuseControlFault);
                 }
+                $mac = (is_null($mac)?'': $db->escapeString($mac));
                 /*
                  * Delete all unused tokens for this user, so we don't fill the database
@@ -663 +665 @@
 
                 $sql .= "INSERT INTO tokens (token_owner, token_issuer, token_id, token_status) VALUES ('" . $this->getId() . "', '" . $this->getId() . "', '$token', '" . TOKEN_UNUSED . "');\n";
-                $sql .= "INSERT INTO connections (user_id, token_id, timestamp_in, node_id, node_ip, last_updated) VALUES ('" . $this->getId() . "', '$token', CURRENT_TIMESTAMP, '$node_id', '$node_ip', CURRENT_TIMESTAMP)";
+                $sql .= "INSERT INTO connections (user_id, token_id, timestamp_in, node_id, node_ip, last_updated, user_mac) VALUES ('" . $this->getId() . "', '$token', CURRENT_TIMESTAMP, '$node_id', '$node_ip', CURRENT_TIMESTAMP, '$mac')";
                 $db->execSqlUpdate($sql, false);
                 $retval = $token;

branches/gbastien/wifidog/login/index.php

@@ -88 +88 @@
 $gw_port = null;
 $gw_id = null;
+$mac = null;
 $logout = null;
 
@@ -118 +119 @@
     exit;
 }
+
+if (isset($_REQUEST["mac"])) {
+    $session->set(SESS_USER_MAC_VAR, $_REQUEST['mac']);
+    $mac = $_REQUEST['mac'];
+}
+
 
 /*
@@ -182 +189 @@
         // Login from a gateway, redirect to the gateway to activate the token
         $user = $network->getSplashOnlyUser();
-        $token = $user->generateConnectionToken();
+        $token = $user->generateConnectionToken($mac);
         User::setCurrentUser($user);
         header("Location: http://" . $gw_address . ":" . $gw_port . "/wifidog/auth?token=" . $token);
@@ -206 +213 @@
         if (!empty($gw_address) && !empty($gw_port)) {
             // Login from a gateway, redirect to the gateway to activate the token
-            $token = $user->generateConnectionToken();
+            $token = $user->generateConnectionToken($mac);
             if(!$token)
             {
@@ -245 +252 @@
 $smarty->assign('gw_port', $gw_port);
 $smarty->assign('gw_id', $gw_id);
+$smarty->assign('mac', $mac);
 
 // Get the login form
@@ -256 +264 @@
 if ($gw_id != null)
 $html .= "<input type='hidden' name='gw_id' value='{$gw_id}'>\n";
+if ($mac != null)
+$html .= "<input type='hidden' name='mac' value='{$mac}'>\n";
 $html .= Authenticator::getLoginUI();
 $html .= "</form>\n";

branches/gbastien/wifidog/signup.php

@@ -228 +228 @@
         $gw_address = $session->get(SESS_GW_ADDRESS_VAR);
         $gw_port = $session->get(SESS_GW_PORT_VAR);
+        $mac = $session->get(SESS_USER_MAC_VAR);
 
         if ($gw_id && $gw_address && $gw_port) {
             // Make sure the user IDs match
             if(($created_user->getId() == $authenticated_user->getId())) {
-                $token = $created_user->generateConnectionToken();
+                $token = $created_user->generateConnectionToken($mac);
 
                 $redirURL = "http://" . $gw_address . ":" . $gw_port . "/wifidog/auth?token=" . $token;