Changeset 1428

Timestamp:

10/30/09 14:21:05 (4 years ago)

Author:

gbastien

Message:

* Network can now be set as case insensitive. Emails are now never case sensitive and usernames' case sensitivity is consistent with network settings (#616)
* Yet again some tab alignment

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/classes/AbstractDb.php (modified) (2 diffs)
• wifidog/classes/Authenticators/AuthenticatorLocalUser.php (modified) (2 diffs)
• wifidog/classes/Network.php (modified) (6 diffs)
• wifidog/classes/NodeList.php (modified) (1 diff)
• wifidog/classes/User.php (modified) (4 diffs)
• wifidog/include/common.php (modified) (1 diff)
• wifidog/include/schema_validate.php (modified) (2 diffs)
• wifidog/js/formutils.js (modified) (1 diff)

trunk/wifidog-auth/CHANGELOG

@@ -1 +1 @@
 # $Id$
 
+2009-10-30 Geneviève Bastien <gbastien@versatic.net>
+  * Network can now be set as case insensitive.  Emails are now never case sensitive and usernames' case sensitivity is consistent with network settings (#616)
+  * Yet again some tab alignment
+  
 2009-10-02 Geneviève Bastien <gbastien@versatic.net>
   * Email address format now corresponds to newer standard RFC2822 (#624)

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

@@ -142 +142 @@
 
         if ($debug == TRUE)
-        echo "<p>".sprintf(_("Elapsed time for query execution : %.6f second(s)"), $sql_timetaken)."</p>\n";
+            echo "<p>".sprintf(_("Elapsed time for query execution : %.6f second(s)"), $sql_timetaken)."</p>\n";
 
         if ($result == FALSE)
@@ -317 +317 @@
     {
         $retval = "";
-
+        
         /* PHP time */
         $parts_of_starttime = explode(' ', $this->construct_start_time);

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

@@ -119 +119 @@
         }
         else{
+            /* gbastien: this is not reusable!!, why not use password directly? */
+            //$password_hash = User::passwordHash($_REQUEST['password']);
+            $password_hash = User::passwordHash($password);
             $password = $db->escapeString($password);
-            $password_hash = User::passwordHash($_REQUEST['password']);
-
-            $sql = "SELECT user_id FROM users WHERE (username='$username' OR email='$username') AND account_origin='".$this->getNetwork()->getId()."' AND pass='$password_hash'";
+            
+            $comparison = ($this->getNetwork()->getUsernamesCaseSensitive()? ' = ': ' ILike ');
+            $sql = "SELECT user_id FROM users WHERE (username$comparison'$username' OR email$comparison'$username') AND account_origin='".$this->getNetwork()->getId()."' AND pass='$password_hash'";
             $db->execSqlUniqueRes($sql, $user_info, false);
 
@@ -141 +144 @@
                  */
                 $user_info = null;
-                $db->execSqlUniqueRes("SELECT * FROM users WHERE (username='$username' OR email='$username') AND account_origin='".$this->getNetwork()->getId()."'", $user_info, false);
+                $db->execSqlUniqueRes("SELECT * FROM users WHERE (username$comparison'$username' OR email$comparison'$username') AND account_origin='".$this->getNetwork()->getId()."'", $user_info, false);
 
                 if ($user_info == null) {

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

@@ -1618 +1618 @@
         return $retVal;
     }
+    
+          /** Are usernames on this network case sensitive or not
+     *
+     * @return bool true or false
+     */
+    public function getUsernamesCaseSensitive()
+    {
+        return (($this->_row['usernames_case_sensitive'] == 't') ? true : false);
+    }
+
+    /** Are usernames on this network case sensitive or not
+     * If set to false, we need to verify if some users have name-clash and propose actions
+     *
+     * @param string $value The new creation date
+     *
+     * @return bool True on success, false on failure
+     */
+    public function setUsernamesCaseSensitive($value)
+    {
+        // Init values
+        $retval = true;
+
+        if ($value != $this->getUsernamesCaseSensitive()) {
+            $db = AbstractDb::getObject();
+            // Verify if usernames differing by case exists
+            if (!$value) {
+                $sql = "Select username, email from users where 
+                    lower(username) in (Select lower(username) as uname from users where account_origin = '{$this->getId()}' group by lower(username) having count(user_id) > 1)
+                    or lower(email) in (Select lower(email) from users where account_origin = '{$this->getId()}' group by lower(email) having count(user_id) > 1) order by username";
+                if (!$db->execSql($sql, $duplicates)) 
+                    $retval = false;
+                if (!empty($duplicates)) {
+                    $duplicatenames = array();
+                    foreach($duplicates as $duplicate) $duplicatenames[] = "{$duplicate['username']} ({$duplicate['email']})";
+                    $this->errorMsg = _("You cannot change the case sensitivity of this network because some users would have duplicate names or emails.  Some action must be performed before.<br/>Here is a list of duplicate usernames: " . implode(', ', $duplicatenames));
+                    $retval = false;
+                }
+            }
+            if ($retval) {
+                $value ? $value = 'TRUE' : $value = 'FALSE';
+                $retval = $db->execSqlUpdate("UPDATE networks SET usernames_case_sensitive = {$value} WHERE network_id = '{$this->getId()}'", false);
+                $this->refresh();
+            }
+        }
+
+        return $retval;
+    }
 
 
@@ -1631 +1678 @@
         // Init values
         $html = '';
+        
+        /*
+         * Verify if an error message was registered before outputting the form
+         */
+        if (isset($this->errorMsg)) {
+             $html .= "<div class='errormsg'>" . $this->errorMsg . "</div>";
+        }
 
         /*
@@ -1711 +1765 @@
         $data = ThemePack::getSelectUI("network_" . $this->getId() . "_theme_pack", $this->getThemePack());
         $html_network_properties[] = InterfaceElements::generateAdminSectionContainer("network_theme_pack", $title, $data);
-
+      
         // Build section
         $html .= InterfaceElements::generateAdminSectionContainer("network_properties", _("Network properties"), implode(null, $html_network_properties));
@@ -1736 +1790 @@
         $help = _("Are nodes allowed to redirect users to the web page they originally requested instead of the portal?");
         $data = InterfaceElements::generateInputCheckbox("network_" . $this->getId() . "_allow_original_URL_redirect", "", _("Yes"), $this->getPortalOriginalUrlAllowed(), "network_allow_original_URL_redirect_radio");
-        $html_network_node_properties[] = InterfaceElements::generateAdminSectionContainer("network_allow_original_URL_redirect", $title, $data, $help);
+        $html_network_node_properties[] = InterfaceElements::generateAdminSectionContainer("network_allow_original_URL_redirect", $title, $data, $help);   
 
         // Build section
@@ -1762 +1816 @@
         $data = InterfaceElements::generateInputCheckbox("network_" . $this->getId() . "_allow_multiple_login", "", _("Yes"), $this->getMultipleLoginAllowed(), "network_allow_multiple_login_radio");
         $html_network_user_verification[] = InterfaceElements::generateAdminSectionContainer("network_allow_multiple_login", $title, $data, $help);
+        
+          
+        //  network_authenticator_params
+        $title = _("Case sensitivity");
+        $help = _("Are usernames case sensitive?");
+        $data = InterfaceElements::generateInputCheckbox("network_" . $this->getId() . "_usernames_case_sensitive","", _("Yes"), $this->getUsernamesCaseSensitive(), "network_usernames_case_sensitive");
+        $html_network_user_verification[] = InterfaceElements::generateAdminSectionContainer("network_usernames_case_sensitive", $title, $data, $help);
 
         // Build section
@@ -1924 +1985 @@
         $name = "network_".$this->getId()."_validation_email_from_address";
         $this->setValidationEmailFromAddress($_REQUEST[$name]);
+        
+        $name = "network_" . $this->getId() . "_usernames_case_sensitive";
+        $this->setUsernamesCaseSensitive(empty ($_REQUEST[$name]) ? false : true);
 
         //  theme_pack

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

@@ -208 +208 @@
 
         $items[] = array('path' => 'node_lists/map',
-        'title' => _("Deployed HotSpots map"),
-        'url' => BASE_URL_PATH."hotspots_map.php"
-                );
+            'title' => _("Deployed HotSpots map"),
+            'url' => BASE_URL_PATH."hotspots_map.php"
+       );
 
         $listTypes=self::getAvailableNodeListTypes();
         //pretty_print_r($listTypes);
         foreach ($listTypes as $type) {
-                    $nodeListClass = "NodeList" . $type;
-                    require_once("classes/NodeLists/NodeList{$type}.php");
+            $nodeListClass = "NodeList" . $type;
+            require_once("classes/NodeLists/NodeList{$type}.php");
             if(call_user_func(array($nodeListClass, 'isAvailable'))) {
-            $items[] = array('path' => 'node_lists/'.$type,
-            'title' => sprintf(_("List in %s format"), $type),
-            'url' => BASE_URL_PATH."hotspot_status.php?format=$type"
-            );
+                $items[] = array('path' => 'node_lists/'.$type,
+                    'title' => sprintf(_("List in %s format"), $type),
+                    'url' => BASE_URL_PATH."hotspot_status.php?format=$type"
+                );
             }
         }
         $items[] = array('path' => 'node_lists/technical_status',
-        'title' => _("Full node technical status (includes non-deployed nodes)"),
-        'url' => BASE_URL_PATH."node_list.php"
-                );
+            'title' => _("Full node technical status (includes non-deployed nodes)"),
+            'url' => BASE_URL_PATH."node_list.php"
+        );
         $items[] = array('path' => 'node_lists',
-        'title' => _('Find Hotspots'),
-        'type' => MENU_ITEM_GROUPING);
-
-
-
+            'title' => _('Find Hotspots'),
+            'type' => MENU_ITEM_GROUPING);
 
         return $items;

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

@@ -160 +160 @@
 
         $username_str = $db->escapeString($username);
+        $comparison = ($account_origin->getUsernamesCaseSensitive()? '=': 'ILike');
         $account_origin_str = $db->escapeString($account_origin->getId());
-        $db->execSqlUniqueRes("SELECT user_id FROM users WHERE username = '$username_str' AND account_origin = '$account_origin_str'", $user_info, false);
+        $db->execSqlUniqueRes("SELECT user_id FROM users WHERE username {$comparison} '$username_str' AND account_origin = '$account_origin_str'", $user_info, false);
 
         if ($user_info != null) {
@@ -182 +183 @@
 
         $usernameOrEmail_str = $db->escapeString($usernameOrEmail);
-        $db->execSqlUniqueRes("SELECT user_id FROM users WHERE username ILike '$usernameOrEmail_str' OR email ILike '$usernameOrEmail_str'", $user_info, false);
+        $db->execSqlUniqueRes("SELECT user_id FROM users WHERE username = '$usernameOrEmail_str' OR email ILike '$usernameOrEmail_str'", $user_info, false);
 
         if ($user_info != null) {
@@ -221 +222 @@
         $email_str = $db->escapeString($email);
         $account_origin_str = $db->escapeString($account_origin->getId());
-        $db->execSqlUniqueRes("SELECT user_id FROM users WHERE email = '$email_str' AND account_origin = '$account_origin_str'", $user_info, false);
+        $db->execSqlUniqueRes("SELECT user_id FROM users WHERE email ILike '$email_str' AND account_origin = '$account_origin_str'", $user_info, false);
 
         if ($user_info != null)
@@ -378 +379 @@
         if ($value != $this->getUsername()) {
             $db = AbstractDb::getObject();
+            $otherUser = User::getUserByUsernameAndOrigin($value, $this->getNetwork());
+            if (!is_null($otherUser)) {
+                throw new exception(sprintf(_("Sorry, the username %s is not available"), $value));
+            }
             $value = $db->escapeString($value);
             $retval = @ $db->execSqlUpdate("UPDATE users SET username = '{$value}' WHERE user_id='{$this->id}'", false);
-            if (!$retval) {
-                throw new exception(sprintf(_("Sorry, the username %s is not available"), $value));
-            }
             $this->refresh();
         }

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

@@ -347 +347 @@
 
             return $string;
-    }
-}
-$myLogfile = !defined('WIFIDOG_LOGFILE') ? "tmp/wifidog.log" : constant('WIFIDOG_LOGFILE');
-if (!empty ($myLogfile)) {
-    if (substr($myLogfile, 0, 1) != '/')
-    $myLogfile = WIFIDOG_ABS_FILE_PATH . $myLogfile;
-
-    EventLogging :: stAddChannel(new FileChannel($myLogfile, new WifidogSyslogFormatter(), 'warning,notice'), 'logfile');
-}
+        }
+    }
+    $myLogfile = !defined('WIFIDOG_LOGFILE') ? "tmp/wifidog.log" : constant('WIFIDOG_LOGFILE');
+    if (!empty ($myLogfile)) {
+        if (substr($myLogfile, 0, 1) != '/')
+            $myLogfile = WIFIDOG_ABS_FILE_PATH . $myLogfile;
+
+        EventLogging :: stAddChannel(new FileChannel($myLogfile, new WifidogSyslogFormatter(), 'warning,notice'), 'logfile');
+    }
 
 // trigger_error("here i am", E_USER_NOTICE);

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

@@ -48 +48 @@
  * Define current database schema version
  */
-define('REQUIRED_SCHEMA_VERSION', 66);
+define('REQUIRED_SCHEMA_VERSION', 67);
 /** Used to test a new shecma version before modyfying the database */
 define('SCHEMA_UPDATE_TEST_MODE', false);
@@ -1449 +1449 @@
     }
     
+    $new_schema_version = 67;
+    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 .= "\n\nALTER TABLE networks ADD COLUMN usernames_case_sensitive boolean NOT NULL DEFAULT true;\n";
+    }
+    
     /*
      $new_schema_version = ;

trunk/wifidog-auth/wifidog/js/formutils.js

@@ -45 +45 @@
   var str = elem.value;
   //var re = /^[\w-+]+(\.[\w+-]+)*@([\w-]+\.)+[a-zA-Z]{2,7}$/;
-  var re = /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/;
+  var re = /^[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-zA-Z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-zA-Z0-9](?:[a-z0-9-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$/;
   if (!str.match(re)) {
         focusElement(elem.form.name, elem.name);