Changeset 708

Timestamp:

09/02/05 03:16:02 (3 years ago)

Author:

benoitg

Message:

2005-09-01 Benoit Gr�goire <bock@step.polymtl.ca>

WARNING: DO NOT use the CVS auth server in production until further notice.
Massive internal changes are underway.
Use the release tagged 1.0m1 in production.

• Network abstraction mostly complete, including UI.
  All that is missing is new network creation, network stakeholder UI and testing.
  
• Cleanup the config file of all the now unneeded constants.
  Note that the install script is currently broken.
  There can now be multiple networks on the server.
  The install script will have to make sure that there is at least one, with one super-admin
  

Files:

• trunk/wifidog-auth/ChangeLog (modified) (1 diff)
• trunk/wifidog-auth/INSTALL (modified) (1 diff)
• trunk/wifidog-auth/wifidog/admin/incoming_outgoing_swap.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/auth/index.php (modified) (2 diffs)
• trunk/wifidog-auth/wifidog/change_password.php (modified) (3 diffs)
• trunk/wifidog-auth/wifidog/classes/AbstractDbPostgres.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/classes/Authenticator.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/classes/AuthenticatorLocalUser.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/classes/AuthenticatorRadius.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/classes/Content.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/classes/Content/ContentGroup.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/classes/MainUI.php (modified) (3 diffs)
• trunk/wifidog-auth/wifidog/classes/Network.php (modified) (14 diffs)
• trunk/wifidog-auth/wifidog/classes/Node.php (modified) (4 diffs)
• trunk/wifidog-auth/wifidog/classes/SmartyWifidog.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/classes/User.php (modified) (7 diffs)
• trunk/wifidog-auth/wifidog/config.php (modified) (2 diffs)
• trunk/wifidog-auth/wifidog/content/index.php (modified) (2 diffs)
• trunk/wifidog-auth/wifidog/hotspot_status.php (modified) (17 diffs)
• trunk/wifidog-auth/wifidog/include/schema_validate.php (modified) (6 diffs)
• trunk/wifidog-auth/wifidog/index.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/install.php (modified) (3 diffs)
• trunk/wifidog-auth/wifidog/login/index.php (modified) (4 diffs)
• trunk/wifidog-auth/wifidog/lost_password.php (modified) (2 diffs)
• trunk/wifidog-auth/wifidog/lost_username.php (modified) (2 diffs)
• trunk/wifidog-auth/wifidog/portal/index.php (modified) (3 diffs)
• trunk/wifidog-auth/wifidog/resend_validation.php (modified) (2 diffs)
• trunk/wifidog-auth/wifidog/signup.php (modified) (2 diffs)

trunk/wifidog-auth/ChangeLog

@@ +1 @@
+2005-09-01 Benoit Grégoire  <bock@step.polymtl.ca>
+        WARNING:  DO NOT use the CVS auth server in production until further notice.  
+        Massive internal changes are underway.  
+        Use the release tagged 1.0m1 in production.
+        * Network abstraction mostly complete, including UI.  
+        All that is missing is new network creation, network stakeholder UI and testing.  
+        * Cleanup the config file of all the now unneeded constants. 
+         Note that the install script is currently broken.  
+        There can now be multiple networks on the server.  
+        The install script will have to make sure that there is at least one, with one super-admin
+
-2005-08-31 Francois Proulx <francois.proulx@gmail.com>
-        * Fixed bug where node ID containing periods, whitespaces or underscores would confuse PHP
-        * MD5 hash is used to make sur the http vars are unique
-        * This is only valid for Node administration
-
+
+
+
-2005-08-31 Benoit Grégoire  <bock@step.polymtl.ca>
-        * Node.php:  Fix node creation

trunk/wifidog-auth/INSTALL

@@ -59 +59 @@
-*****************************************
-
+*****************************************
+Backup and restore
+*****************************************
+
+To backup:
+        pg_dump wifidog --blobs --file=wifidog_backup.sql --format=c --ignore-version --no-owner -v --compress=3 -U wifidog
+
+To restore from a backup:
+        dropdb wifidog
+        createdb wifidog --encoding=UTF-8 --owner=wifidog
+        pg_restore -U wifidog -d wifidog -v wifidog_backup.sql
-
-Enjoy!

trunk/wifidog-auth/wifidog/admin/incoming_outgoing_swap.php

@@ -21 +21 @@
-  /**@file node_list.php
-   * Network status page
-
+go
-   */
-define('BASEPATH','../');
-require_once 'admin_common.php';
-
-". HOTSPOT_NETWORK_NAME ._(' cumulative user statistics')."
+incoming_outgoing_swap
-echo "<div id='navLeft'>\n";
-//echo get_user_management_menu();

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

@@ -32 +32 @@
-$auth_message = '';
-
+$token = null;
+if(!empty($_REQUEST['token']))
+{
-$token = $db->EscapeString($_REQUEST['token']);
-
+
+
+
-if ($info != null)
-{
-        // Retrieve the associated authenticator
-
-
-
+
+
+
+
+
+
+
+
+
-        {
-                if ($info['token_status'] == TOKEN_UNUSED)
@@ -123 +134 @@
-                }
-}
+}
-else
-{

trunk/wifidog-auth/wifidog/change_password.php

@@ -26 +26 @@
-define('BASEPATH','./');
-require_once BASEPATH.'include/common.php';
+require_once BASEPATH.'classes/MainUI.php';
-require_once BASEPATH.'include/common_interface.php';
-require_once BASEPATH.'classes/User.php';
-require_once BASEPATH.'classes/MainUI.php';
-
-isset($_REQUEST["username"]) && $smarty->assign("username", $_REQUEST["username"]);
@@ -34 +34 @@
-if (isset($_REQUEST["submit"])) {
-    try {
- AUTH_SOURCE_ARRAY
-_REQUEST['auth_source'] && in_array($_REQUEST['auth_source'], array_keys($AUTH_SOURCE_ARRAY)) && $account_origin = $_REQUEST['auth_source']
+
+account_origin = Networt::getObject($_REQUEST['auth_source'])
-                
-        if (!$account_origin || !$_REQUEST["username"] || !$_REQUEST["oldpassword"] || !$_REQUEST["newpassword"] || !$_REQUEST["newpassword_again"])
@@ -73 +73 @@
-$sources = array ();
-// Preserve keys
-
-
-
+
+
+
+
-                
-isset ($sources) && $smarty->assign('auth_sources', $sources);

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

@@ -271 +271 @@
-         @param $sql requête SELECT à exécuter
-         @param $debug Si TRUE, affiche la requête brute
+         @return false on failure, true otherwise
-         */
-        function ExecSqlUpdate($sql, $debug=false)

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

@@ -23 +23 @@
- * Technologies Coeus inc.
- */
+require_once 'AuthenticatorLocalUser.php';
+require_once 'AuthenticatorRadius.php';
-
-/** Abstract class to represent an authentication source */

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

@@ -47 +47 @@
-        {
-                return get_class($account_origin['authenticator']) == "AuthenticatorLocalUser";
-        }
-
-        /**
-         * Returns in array containing only Local User account origins
-         * @return array
-         */
-        public static function getAllLocalUserAccountOrigins()
-        {
-                global $AUTH_SOURCE_ARRAY;
-                return array_filter($AUTH_SOURCE_ARRAY, array("self", "isLocalUserAccountOrigin"));
-        }
-

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

@@ -46 +46 @@
-        /**
-         * AuthenticatorRadius constructor
+         * Example:  new AuthenticatorRadius(IDRC_ACCOUNT_ORIGIN, "192.168.0.11",
+         * 1812, 1813, "secret_key", "CHAP_MD5");
-         * @param $account_orgin : The origin of the account
-         * @param $host : hostname of the RADIUS server

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

@@ -233 +233 @@
-        public static function getSelectContentUI($user_prefix, $sql_additional_where = null)
-        {
-                global $AUTH_SOURCE_ARRAY;
-                $html = '';
-                $name = "{$user_prefix}";

trunk/wifidog-auth/wifidog/classes/Content/ContentGroup.php

@@ -315 +315 @@
-
-                /* content_ordering_mode */
-                global $AUTH_SOURCE_ARRAY;
-                $html .= "<div class='admin_section_container'>\n";
-                $html .= "<div class='admin_section_title'>"._("In what order should the content displayed?").": </div>\n";

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

@@ -25 +25 @@
- */
-require_once BASEPATH.'include/common.php';
+        /** @note We put a call to validate_schema() here so it systematically called
+ * from any UI page, but not from any machine readable pages 
+ */ 
+                require_once BASEPATH.'include/schema_validate.php';
+                validate_schema();
+                
-require_once BASEPATH.'include/common_interface.php';
-
@@ -39 +45 @@
-        private $footer_scripts = array ();
-
-        
-        /** @note We put a call to validate_schema() here so it systematically called
- * from any UI page, but not from any machine readable pages 
- */ 
-        function __construct()
-        {
-                require_once BASEPATH.'include/schema_validate.php';
-                validate_schema();
-
-                $this->smarty = new SmartyWifidog();
-                $this->title = Network :: getCurrentNetwork()->getName().' '._("authentication server"); //Default title
@@ -357 +356 @@
-        {
-                $html = "<p>$errmsg</p>\n";
-
+
+
+
+
+
-                $this->setMainContent($html);
-                $this->display();

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

@@ -1 +1 @@
-<?php
+
-/********************************************************************\
- * This program is free software; you can redistribute it and/or    *
@@ -31 +32 @@
-{
-        private $id; /**< The network id */
+        private $mRow;
-
-        /** Get an instance of the object
@@ -42 +44 @@
-        }
-
+        /** Get all the Networks configured on this server
+         * @return an array of Network objects.  The default network is returned
+         * first
+         */
+        static function getAllNetworks()
+        {
+                $retval = array ();
+                global $db;
+                $sql = "SELECT network_id FROM networks ORDER BY is_default_network DESC";
+                $network_rows = null;
+                $db->ExecSql($sql, $network_rows, false);
+                if ($network_rows == null)
+                {
+                        throw new Exception(_("Network::getAllNetworks:  Fatal error: No networks in the database!"));
+                }
+                foreach ($network_rows as $network_row)
+                {
+                        $retval[] = new self($network_row['network_id']);
+                }
+                return $retval;
+        }
+
+        /** Get the default network
+         * @return a Network object, NEVER returns null.
+         */
+        static function getDefaultNetwork($real_network_only = false)
+        {
+                $retval = null;
+                        global $db;
+                        $sql = "SELECT network_id FROM networks WHERE is_default_network=TRUE ORDER BY creation_date LIMIT 1";
+                        $network_row = null;
+                        $db->ExecSqlUniqueRes($sql, $network_row, false);
+                        if ($network_row == null)
+                        {
+                                throw new Exception(_("Network::getDefaultNetwork:  Fatal error: Unable to find the default network!"));
+                        }
+                        $retval = new self($network_row['network_id']);
+                return $retval;
+        }
+        
-        /** Get the current network for which the portal is displayed or to which a user is physically connected.
-
-
+
+
+
+
-         */
-        static function getCurrentNetwork($real_network_only = false)
-        {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -69 +120 @@
-        public static function getSelectNetworkUI($user_prefix)
-        {
-                global $AUTH_SOURCE_ARRAY;
-                $html = '';
-                $name = $user_prefix;
-                $html .= _("Network:")." \n";
-
+
+
+
+
+
+
+
+
+
+
+
+
-                if ($number_of_networks > 1)
-                {
-                        $i = 0;
-AUTH_SOURCE_ARRAY as $network_id => $network_info
+network_rows as $network_row
-                        {
-id
-info
+row['network_id']
+row
-                                $i ++;
-                        }
@@ -88 +149 @@
-                else
-                {
-AUTH_SOURCE_ARRAY as $network_id => $network_info
+network_rows as $network_row
-                        {
-info
-id
+row
+row[network_id]
-                        }
-                }
@@ -105 +166 @@
-                $object = null;
-                $name = "{$user_prefix}";
-(!empty
+ (!empty 
-                        return new self($_REQUEST[$name]);
-                else
@@ -113 +174 @@
-        private function __construct($p_network_id)
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -140 +199 @@
-        public function getTechSupportEmail()
-        {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        /** Retreives the network name 
-The id
+A string
-        public function getName()
-        {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -154 +245 @@
-        public function getHomepageURL()
-        {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        /**Get an array of all Content linked to the network
-        * @param boolean $exclude_subscribed_content
-    
+       
-        * @return an array of Content or an empty arrray */
-        function getAllContent($exclude_subscribed_content = false, $subscriber = null)
-        {
-   
+       
-                $retval = array ();
-        
+               
-                if ($exclude_subscribed_content == true && $subscriber)
-                        $sql = "SELECT content_id FROM network_has_content WHERE network_id='$this->id' AND content_id NOT IN (SELECT content_id FROM user_has_content WHERE user_id = '{$subscriber->getId()}') ORDER BY subscribe_timestamp DESC";
@@ -171 +479 @@
-                        $sql = "SELECT content_id FROM network_has_content WHERE network_id='$this->id' ORDER BY subscribe_timestamp DESC";
-                $db->ExecSql($sql, $content_rows, false);
-
+
-                if ($content_rows != null)
-                {
@@ -185 +493 @@
-         * @return The HTML fragment for this interface */
-
-        /** Get the Authenticator object for this network */
-        public function getAuthenticator()
-        {
-                global $AUTH_SOURCE_ARRAY;
-                return $AUTH_SOURCE_ARRAY[$this->id]['authenticator'];
-        }
-
-        public function getAdminUI()
-        {
@@ -199 +500 @@
-                $html .= "<div class='admin_class'>Network (".get_class($this)." instance)</div>\n";
-
+                // network_id
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("Network ID")." : </div>\n";
+                $html .= "<div class='admin_section_data'>\n";
+                $name = "network_".$this->getId()."_name";
+                $value = htmlspecialchars($this->getId(), ENT_QUOTES);
+                $html .= $value;
+                //$html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
+                $html .= "</div>\n";
+                $html .= "</div>\n";
+                
+                // name
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("Network name")." : </div>\n";
+                $html .= "<div class='admin_section_data'>\n";
+                $name = "network_".$this->getId()."_name";
+                $value = htmlspecialchars($this->getName(), ENT_QUOTES);
+                $html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
+                $html .= "</div>\n";
+                $html .= "</div>\n";
+
+                // homepage_url
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("Network's web site")." : </div>\n";
+                $html .= "<div class='admin_section_data'>\n";
+                $name = "network_".$this->getId()."_homepage_url";
+                $value = htmlspecialchars($this->getHomepageURL(), ENT_QUOTES);
+                $html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
+                $html .= "</div>\n";
+                $html .= "</div>\n";
+
+                // tech_support_email
+                $html .= "<div class='admin_section_container'>\n";
+                $html .= "<div class='admin_section_title'>"._("Technical support email")." : </div>\n";
+                $html .= "<div class='admin_section_data'>\n";
+                $name = "network_".$this->getId()."_tech_support_email";
+                $value = htmlspecialchars($this->getTechSupportEmail(), ENT_QUOTES);
+                $html .= "<input type='text' size ='50' value='$value' name='$name'>\n";
+                $html .= "</div>\n";
+                $html .= "</div>\n";
+
+
+                //  network_authenticator_class
+                $html .= "<div class='admin_section_container'>\n";
+                $h