Non-maintainer commit: Version bump for security bug 278864.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 192 insertions, 2 deletions

diff --git a/www-apps/phpgroupware/ChangeLog b/www-apps/phpgroupware/ChangeLog
index a27f37ad088c..f03d3f50ef43 100644
--- a/www-apps/phpgroupware/ChangeLog
+++ b/www-apps/phpgroupware/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/phpgroupware
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/phpgroupware/ChangeLog,v 1.35 2008/02/23 21:15:05 hollow Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpgroupware/ChangeLog,v 1.36 2009/08/12 11:10:49 a3li Exp $
+
+*phpgroupware-0.9.16.012-r1 (12 Aug 2009)
+
+  12 Aug 2009; Alex Legler <a3li@gentoo.org>
+  +files/phpgroupware-SA35519.patch, +phpgroupware-0.9.16.012-r1.ebuild:
+  Non-maintainer commit: Version bump for security bug 278864.
 
   23 Feb 2008; Benedikt Böhm <hollow@gentoo.org> metadata.xml,
   phpgroupware-0.9.16.012.ebuild:
diff --git a/www-apps/phpgroupware/files/phpgroupware-SA35519.patch b/www-apps/phpgroupware/files/phpgroupware-SA35519.patch
new file mode 100644
index 000000000000..f4cfdda81217
--- /dev/null
+++ b/www-apps/phpgroupware/files/phpgroupware-SA35519.patch
@@ -0,0 +1,145 @@
+Fix security issues described in Secunia Advisory SA35519. Bug 278864.
+svn diff directly from upstream SVN.
+
+Index: phpgwapi/doc/CHANGELOG
+===================================================================
+--- phpgwapi/doc/CHANGELOG	(revision 19116)
++++ phpgwapi/doc/CHANGELOG	(revision 19117)
+@@ -1,3 +1,22 @@
++[0.9.16.014]
++	Security Release with bug fixes
++		* Remote File Disclosure in /addressbook/csv_import.php
++		* SQL injection in /login.php
++		* XSS in /login.php
++		* Local file inclusion and Remote file execution in 
++		/addressbook/inc/class.uiXport.inc.php
++		All via Secunia - see SA35519
++
++	0.9.14 -> 0.916 upgrade fixes
++
++	Addressbook usability fixes
++
++[0.9.16.013]
++	No release (stupid superstitious reasons)
++
++[0.9.16.012]
++	Upgrade phpsysinfo
++
+ [0.9.16.011]
+ 	Security Release with bug fixes
+ 		- Fix for Vulnerability in Calendar
+Index: phpgwapi/inc/class.auth_sql.inc.php
+===================================================================
+--- phpgwapi/inc/class.auth_sql.inc.php	(revision 19116)
++++ phpgwapi/inc/class.auth_sql.inc.php	(revision 19117)
+@@ -40,11 +40,15 @@
+ 
+ 			if ($passwd_type == 'md5')
+ 			{
++				if(!preg_match('/^[0-9a-f]*$/', $passwd))
++				{
++					return False;
++				}
+ 				$_passwd = $passwd;
+ 			}
+ 
+ 			$db->query("SELECT * FROM phpgw_accounts WHERE account_lid = '$username' AND "
+-				. "account_pwd='" . $_passwd . "' AND account_status ='A'",__LINE__,__FILE__);
++				. "account_pwd='$_passwd' AND account_status ='A'",__LINE__,__FILE__);
+ 			$db->next_record();
+ 
+ 			if ($db->f('account_lid'))
+Index: login.php
+===================================================================
+--- login.php	(revision 19116)
++++ login.php	(revision 19117)
+@@ -329,7 +329,7 @@
+ 	{
+ 		if (ereg('phpgw_',$name))
+ 		{
+-			$extra_vars .= '&' . $name . '=' . urlencode($value);
++			$extra_vars .= '&' . urlencode($name) . '=' . urlencode($value);
+ 		}
+ 	}
+ 
+Index: addressbook/inc/class.uiXport.inc.php
+===================================================================
+--- addressbook/inc/class.uiXport.inc.php	(revision 19116)
++++ addressbook/inc/class.uiXport.inc.php	(revision 19117)
+@@ -73,7 +73,8 @@
+ 
+ 		function import()
+ 		{
+-			if ($_REQUEST['convert']) //&& ($_FILES['tsvfile']['error'] == UPLOAD_ERR_OK))
++			$conv_type_a = $GLOBALS['phpgw']->session->appsession('conv_type_values_i', 'addressbook');
++			if ($_REQUEST['convert'] && is_array($conv_type_a) && in_array($_REQUEST['conv_type'], $conv_type_a)) //&& ($_FILES['tsvfile']['error'] == UPLOAD_ERR_OK))
+ 			{
+ 				$buffer = $this->bo->import($_FILES['tsvfile']['tmp_name'],$_REQUEST['conv_type'],$_REQUEST['private'],$_REQUEST['fcat_id']);
+ 
+@@ -130,7 +131,7 @@
+ 					$fname = ereg_replace('_',' ',$myfilearray[$i]);
+ 					$conv .= '<OPTION VALUE="' . $myfilearray[$i].'">' . $fname . '</OPTION>';
+ 				}
+-
++				$GLOBALS['phpgw']->session->appsession('conv_type_values_i', 'addressbook', $myfilearray);
+ 				$this->template->set_var('lang_cancel',lang('Cancel'));
+ 				$this->template->set_var('lang_cat',lang('Select Category'));
+ 				$this->template->set_var('cancel_url',$GLOBALS['phpgw']->link('/index.php','menuaction=addressbook.uiaddressbook.index'));
+@@ -173,7 +174,8 @@
+ 			
+ 			//$entries = $this->bo->$get_data_function($fields, $this->limit, $this->start, $this->order, $this->sort, '', $criteria);
+ 			
+-			if ($_REQUEST['convert'])
++			$conv_type_a = $GLOBALS['phpgw']->session->appsession('conv_type_values_e', 'addressbook');
++			if ($_REQUEST['convert'] && is_array($conv_type_a) && in_array($_REQUEST['conv_type'], $conv_type_a))
+ 			{
+ 				if ($_REQUEST['conv_type'] == 'none')
+ 				{
+@@ -248,6 +250,7 @@
+ 					$conv .= '        <option value="'.$myfilearray[$i].'">'.$fname.'</option>'."\n";
+ 				}
+ 
++				$GLOBALS['phpgw']->session->appsession('conv_type_values_e', 'addressbook', $myfilearray);
+ 				$this->template->set_var('lang_cancel',lang('Cancel'));
+ 				$this->template->set_var('lang_cat',lang('Select Category'));
+ 				$this->template->set_var('cat_link',$this->cat_option($this->cat_id,False,False));
+Index: addressbook/csv_import.php
+===================================================================
+--- addressbook/csv_import.php	(revision 19116)
++++ addressbook/csv_import.php	(revision 19117)
+@@ -31,12 +31,20 @@
+ 	$GLOBALS['phpgw']->template->set_block('import','ffooter','ffooterhandle');
+ 	$GLOBALS['phpgw']->template->set_block('import','imported','importedhandle');
+ 
+-	$csvfile  = isset($_POST['csvfile']) ? $_POST['csvfile'] : $_FILES['csvfile']['tmp_name'];
++	$csvfile  = $_FILES['csvfile']['tmp_name'];
+ 
+ 	if($_POST['action'] == 'download' && (!$_POST['fieldsep'] || !$csvfile || !($fp=fopen($csvfile,'rb'))))
+ 	{
+ 		$_POST['action'] = '';
+ 	}
++	if($_POST['action'] == 'import')
++	{
++		$csvfile = $GLOBALS['phpgw']->session->appsession('import_data', 'addressbook');
++		if(!file_exists($csvfile))
++		{
++			$_POST['action'] = '';
++		}
++	}
+ 	$GLOBALS['phpgw']->template->set_var('action_url',$GLOBALS['phpgw']->link('/addressbook/csv_import.php'));
+ 
+ 	$PSep = '||'; // Pattern-Separator, separats the pattern-replacement-pairs in trans
+@@ -175,9 +183,10 @@
+ 			$GLOBALS['phpgw']->template->set_var('max',200);
+ 			$GLOBALS['phpgw']->template->parse('ffooterhandle','ffooter'); 
+ 			fclose($fp);
+-			$old = $csvfile; $csvfile = $GLOBALS['phpgw_info']['server']['temp_dir'].'/addrbook_import_'.basename($csvfile);
+-			rename($old,$csvfile); 
+-			$hiddenvars .= '<input type="hidden" name="csvfile" value="'.$csvfile.'">';
++			$old = $csvfile; $csvfile = $GLOBALS['phpgw_info']['server']['temp_dir'].'/addrbook_import_'.$GLOBALS['phpgw_info']['user']['account_id'].'_'.basename($csvfile);
++			rename($old,$csvfile);
++			$GLOBALS['phpgw']->session->appsession('import_data', 'addressbook', $csvfile);
++			//$hiddenvars .= '<input type="hidden" name="csvfile" value="'.$csvfile.'">';
+ 			$mktime_lotus = "${PSep}0?([0-9]+)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*)[ .:-]+0?([0-9]*).*$ASep@mktime(${VPre}4,${VPre}5,${VPre}6,${VPre}2,${VPre}3,${VPre}1)";
+ 			$help_on_trans = "<a name=\"help\"></a><b>How to use Translation's</b><p>".
+ 				"Translations enable you to change / adapt the content of each CSV field for your needs. <br />".
diff --git a/www-apps/phpgroupware/phpgroupware-0.9.16.012-r1.ebuild b/www-apps/phpgroupware/phpgroupware-0.9.16.012-r1.ebuild
new file mode 100644
index 000000000000..016da79fb186
--- /dev/null
+++ b/www-apps/phpgroupware/phpgroupware-0.9.16.012-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/phpgroupware/phpgroupware-0.9.16.012-r1.ebuild,v 1.1 2009/08/12 11:10:49 a3li Exp $
+
+inherit webapp eutils depend.php
+
+DESCRIPTION="intranet/groupware tool and application framework"
+HOMEPAGE="http://www.phpgroupware.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+IUSE=""
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+
+need_httpd_cgi
+need_php_httpd
+
+S="${WORKDIR}"/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	ecvs_clean
+
+	epatch "${FILESDIR}/${PN}-SA35519.patch"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dohtml ${PN}/doc/en_US/html/admin/*.html
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/fudforum
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_src_install
+}