[gentoo-commits] gentoo-projects commit in forums/htdocs: common.php groupcp.php privmsg.php profile.php rss.php search.php

[Dean Stephens (desultory)]

desultory    09/07/30 06:38:50

  Modified:             common.php groupcp.php privmsg.php profile.php
                        rss.php search.php
  Log:
  Upgrade to 2.0.23, add some proxy fixes, fix bug 191626 and bug 170166.

Revision  Changes    Path
1.9                  forums/htdocs/common.php

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/common.php?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/common.php?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/common.php?r1=1.8&r2=1.9

Index: common.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/common.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- common.php	9 Jun 2006 19:14:17 -0000	1.8
+++ common.php	30 Jul 2009 06:38:50 -0000	1.9
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: common.php,v 1.8 2006/06/09 19:14:17 tomk Exp $
+ *   $Id: common.php,v 1.9 2009/07/30 06:38:50 desultory Exp $
  *
  ***************************************************************************/
 
@@ -204,6 +204,28 @@
 // even bother complaining ... go scream and shout at the idiots out there who feel
 // "clever" is doing harm rather than good ... karma is a great thing ... :)
 $client_ip = ( !empty($HTTP_SERVER_VARS['REMOTE_ADDR']) ) ? $HTTP_SERVER_VARS['REMOTE_ADDR'] : ( ( !empty($HTTP_ENV_VARS['REMOTE_ADDR']) ) ? $HTTP_ENV_VARS['REMOTE_ADDR'] : getenv('REMOTE_ADDR') );
+
+// Only trust a proxy on the same host as the server, but do not assume that it is always present.
+if( $client_ip == '127.0.0.1' )
+{
+	$x_forwarded_for = ( isset($_SERVER['HTTP_X_FORWARDED_FOR']) ) ? $_SERVER['HTTP_X_FORWARDED_FOR'] : "";
+
+	if( !empty($x_forwarded_for) ) // The client might actually be on the local host.
+	{
+		
+		// Pull the last IP out and use it for client_ip, the last in the list being the one added by the most recent proxy.
+		// The most recent proxy being the only one which is actually trusted to give correct information.
+		$addrs = explode(', ',$x_forwarded_for);
+		$client_ip = array_pop($addrs);
+		
+		// A better regex might be in order, but this shoudl do for now.
+		if(!preg_match('/^[12]?[0-9]?[0-9]\.[12]?[0-9]?[0-9]\.[12]?[0-9]?[0-9]\.[12]?[0-9]?[0-9]$/',$client_ip))
+		{
+			message_die(CRITICAL_ERROR, "Bad address from proxy: $client_ip");
+		}
+	}
+}
+
 $user_ip = encode_ip($client_ip);
 
 //



1.7                  forums/htdocs/groupcp.php

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/groupcp.php?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/groupcp.php?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/groupcp.php?r1=1.6&r2=1.7

Index: groupcp.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/groupcp.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- groupcp.php	29 Dec 2006 11:52:49 -0000	1.6
+++ groupcp.php	30 Jul 2009 06:38:50 -0000	1.7
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: groupcp.php,v 1.6 2006/12/29 11:52:49 tomk Exp $
+ *   $Id: groupcp.php,v 1.7 2009/07/30 06:38:50 desultory Exp $
  *
  *
  ***************************************************************************/
@@ -120,7 +120,8 @@
 $script_name = preg_replace('/^\/?(.*?)\/?$/', "\\1", trim($board_config['script_path']));
 $script_name = ( $script_name != '' ) ? $script_name . '/groupcp.'.$phpEx : 'groupcp.'.$phpEx;
 $server_name = trim($board_config['server_name']);
-$server_protocol = ( isset($_SERVER['HTTPS']) || $board_config['cookie_secure'] ) ? 'https://' : 'http://';
+// 2008-12 desultory -- Another page, another proxy tweak.
+$server_protocol = ( isset($_SERVER['HTTPS']) || isset($_SERVER["HTTP_FRONT_END_HTTPS"]) || $board_config['cookie_secure'] ) ? 'https://' : 'http://';
 $server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/';
 
 $server_url = $server_protocol . $server_name . $server_port . $script_name;
@@ -146,6 +147,7 @@
 
 $confirm = ( isset($HTTP_POST_VARS['confirm']) ) ? TRUE : 0;
 $cancel = ( isset($HTTP_POST_VARS['cancel']) ) ? TRUE : 0;
+$sid = ( isset($HTTP_POST_VARS['sid']) ) ? $HTTP_POST_VARS['sid'] : '';
 
 $start = ( isset($HTTP_GET_VARS['start']) ) ? intval($HTTP_GET_VARS['start']) : 0;
 $start = ($start < 0) ? 0 : $start;
@@ -210,6 +212,10 @@
 	{
 		redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
 	}
+	else if ( $sid !== $userdata['session_id'] )
+	{
+		message_die(GENERAL_ERROR, $lang['Session_invalid']);
+	}
 
 	$sql = "SELECT ug.user_id, g.group_type
 		FROM " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g 
@@ -322,10 +328,14 @@
 	{
 		redirect(append_sid("groupcp.$phpEx", true));
 	}
-	elseif ( !$userdata['session_logged_in'] )
+	else if ( !$userdata['session_logged_in'] )
 	{
 		redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
 	}
+	else if ( $sid !== $userdata['session_id'] )
+	{
+		message_die(GENERAL_ERROR, $lang['Session_invalid']);
+	}
 
 	if ( $confirm )
 	{
@@ -374,6 +384,7 @@
 		$unsub_msg = ( isset($HTTP_POST_VARS['unsub']) ) ? $lang['Confirm_unsub'] : $lang['Confirm_unsub_pending'];
 
 		$s_hidden_fields = '<input type="hidden" name="' . POST_GROUPS_URL . '" value="' . $group_id . '" /><input type="hidden" name="unsub" value="1" />';
+		$s_hidden_fields .= '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
 
 		$page_title = $lang['Group_Control_Panel'];
 		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
@@ -431,7 +442,7 @@
 							WHERE aa.group_id = g.group_id  
 						)
 					)
-				ORDER BY aa.auth_mod DESC";
+				ORDER BY auth_mod DESC";
 			break;
 
 		case 'oracle':
@@ -472,6 +483,10 @@
 			if ( !$userdata['session_logged_in'] )
 			{
 				redirect(append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
+			} 
+			else if ( $sid !== $userdata['session_id'] )
+			{
+				message_die(GENERAL_ERROR, $lang['Session_invalid']);
 			}
 
 			if ( !$is_moderator )
@@ -926,7 +941,7 @@
 
 	generate_user_info($group_moderator, $board_config['default_dateformat'], $is_moderator, $from, $posts, $joined, $poster_avatar, $profile_img, $profile, $search_img, $search, $pm_img, $pm, $email_img, $email, $www_img, $www, $icq_status_img, $icq_img, $icq, $aim_img, $aim, $msn_img, $msn, $yim_img, $yim);
 
-	$s_hidden_fields .= '';
+	$s_hidden_fields .= '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
 
 	$template->assign_vars(array(
 		'L_GROUP_INFORMATION' => $lang['Group_Information'],
@@ -1306,4 +1321,4 @@
 
 include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
 
-?>
\ No newline at end of file
+?>



1.15                 forums/htdocs/privmsg.php

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/privmsg.php?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/privmsg.php?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/privmsg.php?r1=1.14&r2=1.15

Index: privmsg.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/privmsg.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- privmsg.php	29 Dec 2006 11:57:00 -0000	1.14
+++ privmsg.php	30 Jul 2009 06:38:50 -0000	1.15
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: privmsg.php,v 1.14 2006/12/29 11:57:00 tomk Exp $
+ *   $Id: privmsg.php,v 1.15 2009/07/30 06:38:50 desultory Exp $
  *
  *
  ***************************************************************************/
@@ -674,6 +674,7 @@
 	{
 		$s_hidden_fields = '<input type="hidden" name="mode" value="' . $mode . '" />';
 		$s_hidden_fields .= ( isset($HTTP_POST_VARS['delete']) ) ? '<input type="hidden" name="delete" value="true" />' : '<input type="hidden" name="deleteall" value="true" />';
+		$s_hidden_fields .= '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
 
 		for($i = 0; $i < count($mark_list); $i++)
 		{
@@ -704,7 +705,7 @@
 		include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
 
 	}
-	else if ( $confirm )
+	else if ($confirm && $sid === $userdata['session_id'])
 	{
 		$delete_sql_id = '';
 



1.7                  forums/htdocs/profile.php

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/profile.php?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/profile.php?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/profile.php?r1=1.6&r2=1.7

Index: profile.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/profile.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- profile.php	30 Apr 2006 13:54:45 -0000	1.6
+++ profile.php	30 Jul 2009 06:38:50 -0000	1.7
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: profile.php,v 1.6 2006/04/30 13:54:45 tomk Exp $
+ *   $Id: profile.php,v 1.7 2009/07/30 06:38:50 desultory Exp $
  *
  *
  ***************************************************************************/
@@ -56,7 +56,8 @@
 $script_name = preg_replace('/^\/?(.*?)\/?$/', '\1', trim($board_config['script_path']));
 $script_name = ( $script_name != '' ) ? $script_name . '/profile.'.$phpEx : 'profile.'.$phpEx;
 $server_name = trim($board_config['server_name']);
-$server_protocol = ( isset($_SERVER['HTTPS']) || $board_config['cookie_secure'] ) ? 'https://' : 'http://';
+// 2008-12 desultory -- Proxies possibly possessing protective properties provide potentially pesky problems.
+$server_protocol = ( isset($_SERVER['HTTPS']) || isset($_SERVER["HTTP_FRONT_END_HTTPS"]) || $board_config['cookie_secure'] ) ? 'https://' : 'http://';
 $server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/';
 
 $server_url = $server_protocol . $server_name . $server_port . $script_name;
@@ -146,4 +147,4 @@
 
 redirect(append_sid("index.$phpEx", true));
 
-?>
\ No newline at end of file
+?>



1.7                  forums/htdocs/rss.php

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/rss.php?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/rss.php?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/rss.php?r1=1.6&r2=1.7

Index: rss.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/rss.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rss.php	8 Jun 2006 22:08:45 -0000	1.6
+++ rss.php	30 Jul 2009 06:38:50 -0000	1.7
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2005 Tom Knight
  *   email                : tomk@g.o
  *
- *   $Id: rss.php,v 1.6 2006/06/08 22:08:45 tomk Exp $
+ *   $Id: rss.php,v 1.7 2009/07/30 06:38:50 desultory Exp $
  *
  *
  ***************************************************************************/
@@ -37,6 +37,9 @@
 if (isset($_SERVER['HTTP_HOST']) && isset($_SERVER['SERVER_ADDR']) && isset($_SERVER['REMOTE_ADDR']))
 {
 	// we're being run from apache
+	/* I fail to grasp the logic behind retaining this feature, especially 
+	 * without patching it against abuse via squid, and don't feel like patching 
+	 * it. -- desultory
 	if ($_SERVER['SERVER_ADDR'] == $_SERVER['REMOTE_ADDR'])
 	{
 		// and we're being run locally
@@ -47,6 +50,7 @@
 			$glsa_mode = $_HTTP_GET_VARS['mode'];
 		}
 	}
+	*/
 }
 elseif (isset($_SERVER['USER']) && isset($_SERVER['LOGNAME']))
 {



1.27                 forums/htdocs/search.php

file : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/search.php?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/search.php?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-projects/forums/htdocs/search.php?r1=1.26&r2=1.27

Index: search.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/search.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- search.php	1 Jul 2008 21:59:28 -0000	1.26
+++ search.php	30 Jul 2009 06:38:50 -0000	1.27
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@×××××.com
  *
- *   $Id: search.php,v 1.26 2008/07/01 21:59:28 tomk Exp $
+ *   $Id: search.php,v 1.27 2009/07/30 06:38:50 desultory Exp $
  *
  *
  ***************************************************************************/
@@ -1401,7 +1401,8 @@
 }
 
 // 2005-11-19 tomk - Cache form values when using https
-if (isset($_SERVER['HTTPS']))
+// 2008-12 desultory -- Do the same behind an https proxy.
+if (isset($_SERVER['HTTPS']) || isset($_SERVER["HTTP_FRONT_END_HTTPS"]))
 { 
 	define('IN_SEARCH', true);
 }