Changeset 275 for trunk

Timestamp:

Jul 19, 2007 7:39:26 PM (17 years ago)

Author:

quinn

Message:

Added match_remote_ip_exempt_usernames function for trendease (ported from codebase 1.1dev).

Location:

trunk/lib

Files:

• Auth_SQL.inc.php (modified) (5 diffs)
• Prefs.inc.php (modified) (1 diff)
• SpellCheck.inc.php (modified) (1 diff)

trunk/lib/Auth_SQL.inc.php

@@ -79 +79 @@
         // class instantiation time, or can be saved in the db_table under the login_abuse_exempt field.
         'login_abuse_exempt_usernames' => array(),
+
+        // Specify usernames to exclude from remote_ip matching. Users behind proxy servers should be appended to this array so their shifting remote IP will not log them out.
+        'match_remote_ip_exempt_usernames' => array(),
+
+        // Match the user's current remote IP against the one they logged in with.
+        'match_remote_ip' => true,
 
         // An array of IP blocks that are bypass the remote_ip comparison check. Useful for dynamic IPs or those behind proxy servers.
@@ -387 +393 @@
             'last_access_datetime'  => date('Y-m-d H:i:s'),
             'remote_ip'             => getRemoteAddr(),
-            'login_abuse_exempt'    => isset($user_data['login_abuse_exempt']) ? !empty($user_data['login_abuse_exempt']) : in_array($username, $this->_params['login_abuse_exempt_usernames']),
+            'login_abuse_exempt'    => isset($user_data['login_abuse_exempt']) ? !empty($user_data['login_abuse_exempt']) : in_array(strtolower($username), $this->_params['login_abuse_exempt_usernames']),
+            'match_remote_ip_exempt'=> isset($user_data['match_remote_ip_exempt']) ? !empty($user_data['match_remote_ip_exempt']) : in_array(strtolower($username), $this->_params['match_remote_ip_exempt_usernames']),
             'user_data'             => $user_data
         );
@@ -527 +534 @@
             $user_in_trusted_network = false;
         }
+        
+        // Do we match the user's remote IP at all? Yes, if set in config and not disabled for specific user.
+        if ($this->getParam('match_remote_ip') && !$this->get('match_remote_ip_exempt')) {
+            $remote_ip_is_matched = ($_SESSION['_auth_sql'][$this->_ns]['remote_ip'] == getRemoteAddr() || $user_in_trusted_network);
+        } else {
+            $app->logMsg(sprintf('User %s exempt from remote_ip match.', 
+                ($this->get('user_id') ? ' ' . $this->get('user_id') . ' (' .  $this->get('username') . ')' : '')
+            ), LOG_DEBUG, __FILE__, __LINE__);
+            $remote_ip_is_matched = true;
+        }
 
         // Test login with information stored in session. Skip IP matching for users from trusted networks.
@@ -534 +551 @@
             && strtotime($_SESSION['_auth_sql'][$this->_ns]['login_datetime']) > time() - $this->_params['login_timeout']
             && strtotime($_SESSION['_auth_sql'][$this->_ns]['last_access_datetime']) > time() - $this->_params['idle_timeout']
-            && ($_SESSION['_auth_sql'][$this->_ns]['remote_ip'] == getRemoteAddr() || $user_in_trusted_network)
+            && $remote_ip_is_matched
         ) {
             // User is authenticated!
@@ -571 +588 @@
             }
             if ($_SESSION['_auth_sql'][$this->_ns]['remote_ip'] != getRemoteAddr() && !$user_in_trusted_network) {
-                $expire_reasons[] = sprintf('remote_ip not matched (%s != %s)', $_SESSION['_auth_sql'][$this->_ns]['remote_ip'], getRemoteAddr());
+                if ($this->getFeature('match_remote_ip') && !$this->getVal('match_remote_ip_exempt')) {
+                    $expire_reasons[] = sprintf('remote_ip not matched (%s != %s)', $_SESSION['_auth_sql'][$this->_ns]['remote_ip'], getRemoteAddr());
+                } else {
+                    $expire_reasons[] = sprintf('remote_ip not matched but user was exempt from this check (%s != %s)', $_SESSION['_auth_sql'][$this->_ns]['remote_ip'], getRemoteAddr());
+                }
             }
             $app->logMsg(sprintf('User %s (%s) session expired: %s', $this->get('user_id'), $this->get('username'), join(', ', $expire_reasons)), LOG_INFO, __FILE__, __LINE__);

trunk/lib/Prefs.inc.php

@@ -165 +165 @@
      * Store a key-value pair in the session. If the value is different than what is set by setDefaults
      * the value will be scheduled to be saved in the database.
-     * This function determins what data is saved to the database. Ensure clean values!
+     * This function determines what data is saved to the database. Ensure clean values!
      *
      * @param  string $key          The name of the preference to modify.

trunk/lib/SpellCheck.inc.php

@@ -64 +64 @@
         $app =& App::getInstance();
 
+        if (!extension_loaded('pspell')) {
+            trigger_error('Pspell module not installed', E_USER_ERROR);
+        }
+
         if (!is_array($params) || empty($params)) {
             trigger_error('SpellCheck parameters not set properly', E_USER_ERROR);