Changeset 1445

Timestamp:

02/04/10 16:20:28 (7 months ago)

Author:

gbastien

Message:

* First draft: nothing has changed so far, just the way tokens are generated from a template. Integration of the code by richard Jackson (#684). Not thoroughly tested though.

Location:

branches/newtoken/wifidog

Files:

• classes/AbstractDb.php (modified) (1 diff)
• classes/Authenticator.php (modified) (1 diff)
• classes/Permission.php (modified) (1 diff)
• classes/Token.php (added)
• classes/TokenTemplate.php (added)
• classes/User.php (modified) (1 diff)
• include/schema_validate.php (modified) (2 diffs)
• login/index.php (modified) (4 diffs)

branches/newtoken/wifidog/classes/AbstractDb.php

@@ -357 +357 @@
     {
         // WARNING : magic quotes must be off
+        if (is_null($string))
+            return "null";
         return pg_escape_string($string);
     }

branches/newtoken/wifidog/classes/Authenticator.php

@@ -147 +147 @@
  
         foreach ($network_array as $network) {
-                if ($network->getName() == $default_network)
-                        $default_network_param = $network->getId();
+            if ($network->getName() == $default_network->getName()) {
+                $default_network_param = $network->getId();
+            }
         }
         if (Server::getServer()->getUseGlobalUserAccounts())

branches/newtoken/wifidog/classes/Permission.php

@@ -94 +94 @@
             $PERMISSIONS['NETWORK_PERM_EDIT_DYNAMIC_ABUSE_CONTROL'] = array(_("User is allowed to set dynamic abuse control options for the network"), StakeholderType::Network, false);
             $PERMISSIONS['NETWORK_PERM_ALLOW_GROUP_NODE'] = array(_("User is allowed group nodes into virtual node groups"), StakeholderType::Network, false);
+            $PERMISSIONS['NETWORK_PERM_GENERATE_USERS'] = array(_("User is allowed to generate user accounts"), StakeholderType::Network, false);
+            
 
             $PERMISSIONS['SERVER_PERM_EDIT_ROLES'] = array(_("User is allowed to edit user role definitions"), StakeholderType::Server, true);

branches/newtoken/wifidog/classes/User.php

@@ -1089 +1089 @@
             );
         }
+        if(Security::getObjectsWithPermission(Permission::P('NETWORK_PERM_GENERATE_USERS')))
+        {
+            $items[] = array('path' => 'users/user_generator',
+            'title' => _("User generator"),
+            'url' => BASE_URL_PATH."admin/user_gen.php"
+            );
+        }
         if(Security::getObjectsWithPermission(Permission::P('NETWORK_PERM_VIEW_STATISTICS')))
         {

branches/newtoken/wifidog/include/schema_validate.php

@@ -48 +48 @@
  * Define current database schema version
  */
-define('REQUIRED_SCHEMA_VERSION', 68);
+define('REQUIRED_SCHEMA_VERSION', 69);
 /** Used to test a new shecma version before modyfying the database */
 define('SCHEMA_UPDATE_TEST_MODE', false);
@@ -1525 +1525 @@
     }
     
+    $new_schema_version = 69;
+    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";
+        
+        //$networks = Network::getAllNetworks();
+        $networks = array();
+        $db->execSql("Select network_id from networks", $networks, false);
+        foreach ($networks as $network) {
+            $new_guid = get_guid();
+            $sql .= "INSERT INTO token_templates(token_template_id, token_template_network) values('{$new_guid}', '{$network['network_id']}');\n ";
+        }
+    }
+    
     
     /*

branches/newtoken/wifidog/login/index.php

@@ -77 +77 @@
 require_once('classes/User.php');
 require_once('classes/Network.php');
+require_once('classes/Token.php');
+require_once('classes/TokenTemplate.php');
 require_once('classes/Authenticator.php');
 require_once('classes/MainUI.php');
@@ -181 +183 @@
  */
 
+$templates = array();
+if ($network != null) {
+    
+}
+
 /*
  * If this is a splash-only node, skip the login interface and log-in using
@@ -189 +196 @@
         // Login from a gateway, redirect to the gateway to activate the token
         $user = $network->getSplashOnlyUser();
-        $token = $user->generateConnectionToken($mac);
+        //$token = $user->generateConnectionToken($mac);
+        $token = Token::generateConnectionToken($mac, $network, $user);
         User::setCurrentUser($user);
         header("Location: http://" . $gw_address . ":" . $gw_port . "/wifidog/auth?token=" . $token);
@@ -213 +221 @@
         if (!empty($gw_address) && !empty($gw_port)) {
             // Login from a gateway, redirect to the gateway to activate the token
-            $token = $user->generateConnectionToken($mac);
+            // $token = $user->generateConnectionToken($mac);
+            $token = Token::generateConnectionToken($mac, $network, $user);
             if(!$token)
             {