Changeset 2910

Timestamp:

06/09/10 11:25:39 (14 years ago)

Author:

niltonneto

Message:

Ticket #1041 - Reativada configuração "Verificar endereço IP de todas sessões".

Location:

trunk

Files:

• header.session.inc.php (modified) (2 diffs)
• phpgwapi/inc/class.sessions.inc.php (modified) (1 diff)

trunk/header.session.inc.php

@@ -19 +19 @@
         $user_agent = array();
         if (isset($GLOBALS['phpgw']) && !isset($_SESSION['connection_db_info'])){
+                $_SESSION['phpgw_info']['admin']['server']['sessions_checkip'] = $GLOBALS['phpgw_info']['server']['sessions_checkip'];
                 if($GLOBALS['phpgw_info']['server']['use_https'] == 1) {
                 $new_ip = (isset($_SERVER['HTTP_X_FORWARDED_FOR']) ? $_SERVER['HTTP_X_FORWARDED_FOR']."," : ""). $_SERVER['REMOTE_ADDR'];
                 $GLOBALS['phpgw']->db->query("UPDATE phpgw_access_log SET ip='$new_ip' WHERE account_id <> 0 and lo = 0 and sessionid='{$GLOBALS['sessionid']}'",__LINE__,__FILE__);
                 }
-                $GLOBALS['phpgw']->db->query("select trim(sessionid), ip, browser from phpgw_access_log where account_id <> 0 and lo = 0 and sessionid='{$GLOBALS['sessionid']}' limit 1",__LINE__,__FILE__);
+                $GLOBALS['phpgw']->db->query("select trim(sessionid),".($_SESSION['phpgw_info']['admin']['server']['sessions_checkip'] ? "ip," : "")."browser from phpgw_access_log where account_id <> 0 and lo = 0 and sessionid='{$GLOBALS['sessionid']}' limit 1",__LINE__,__FILE__);
                 $GLOBALS['phpgw']->db->next_record();
                 if($GLOBALS['phpgw']->db->row( ))
@@ -32 +33 @@
                 $http_user_agent = substr($_SERVER[ 'HTTP_USER_AGENT' ],0,199);
                 $user_ip = isset($_SERVER['HTTP_X_FORWARDED_FOR']) ? array($_SERVER['REMOTE_ADDR'], $_SERVER['HTTP_X_FORWARDED_FOR']) : array($_SERVER['REMOTE_ADDR']);
-                $user_agent[] = "{$sess['session_id']}{$user_ip[0]}".$http_user_agent;
+                $user_agent[] = ($_SESSION['phpgw_info']['admin']['server']['sessions_checkip'] ? "{$sess['session_id']}{$user_ip[0]}" : "{$sess['session_id']}").$http_user_agent;
                 if(count($user_ip) == 2) {
                         $user_agent[] = "{$sess['session_id']}{$user_ip[1]}".$http_user_agent;

trunk/phpgwapi/inc/class.sessions.inc.php

@@ -343 +343 @@
                         }
 
-                        /* ExpressoLivre
-                           Necessário comentar para que o redirecionamento de uma sessão
-                           https para uma http funcionasse atrás de um proxy
-                        */
-
-                        /*
-                        if (@$GLOBALS['phpgw_info']['server']['sessions_checkip'])
-                        {
-                                if((PHP_OS != 'Windows') && (PHP_OS != 'WINNT') &&
-                                        (!$GLOBALS['phpgw_info']['user']['session_ip'] || $GLOBALS['phpgw_info']['user']['session_ip'] != $this->getuser_ip())
-                                )
-                                {
-                                        //echo "IP do cliente com https   ---->  ".$GLOBALS['phpgw_info']['user']['session_ip'];
-                                        //echo "<BR>IP do cliente com http ---->  ".$this->getuser_ip();
-                                        if(is_object($GLOBALS['phpgw']->log))
-                                        {
-                                                // This needs some better wording
-                                                $GLOBALS['phpgw']->log->message(array(
-                                                        'text' => 'W-VerifySession, IP %1 doesn\'t match IP %2 in session table',
-                                                        'p1'   => $this->getuser_ip(),
-                                                        'p2'   => $GLOBALS['phpgw_info']['user']['session_ip'],
-                                                        'line' => __LINE__,
-                                                        'file' => __FILE__
-                                                ));
-                                                $GLOBALS['phpgw']->log->commit();
-                                        }
-                                        return False;
-                                }
-                        }
-                        */
-
                         $GLOBALS['phpgw']->acl->acl($this->account_id);
                         $GLOBALS['phpgw']->accounts->accounts($this->account_id);