Bug#619806: CVE-2010-3695: fix XSS

[Steffen Joeris <white@debian.org>]

Package: release.debian.org
Severity: important
Tags: patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

I'd like to upload a fix for imp4 to oldstable-proposed-updates. The fix
is regarding CVE-2010-3695[0]. I won't release a DSA for this issue
since it requires authentication to be exploited, but it should still be
fixed via ospu. Please let me know if you're fine with the upload.

Cheers,
Steffen

[0]: http://security-tracker.debian.org/tracker/CVE-2010-3695


- -- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.38-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iEYEARECAAYFAk2PDGsACgkQ62zWxYk/rQfEVwCgjOesAA8urfIgmhjEVOduREB1
aQ8An2ix1mUy3RiXeT4QFYHfuQmj6maz
=gozt
-----END PGP SIGNATURE-----

diff -u imp4-4.2/debian/changelog imp4-4.2/debian/changelog
--- imp4-4.2/debian/changelog
+++ imp4-4.2/debian/changelog
@@ -1,3 +1,11 @@
+imp4 (4.2-4lenny3) oldstable-proposed-updates; urgency=high
+
+  * Non-maintainer upload by the security team
+  * Fix cross-site scripting via the fm parameters (Closes: #598584)
+    Fixes: CVE-2010-3695
+
+ -- Steffen Joeris <white@debian.org>  Sun, 27 Mar 2011 20:42:56 +1100
+
 imp4 (4.2-4lenny2) stable; urgency=low
 
   * Backport patches from Horde CVS (http://bugs.horde.org/ticket/8836) to turn
only in patch2:
unchanged:
--- imp4-4.2.orig/fetchmailprefs.php
+++ imp4-4.2/fetchmailprefs.php
@@ -164,12 +164,12 @@
     $t->set('to_edit', ($to_edit !== null));
     if ($t->get('to_edit')) {
         $t->set('edit_account', intval($to_edit));
-        $t->set('fmid', $fm_account->getValue('id', $to_edit));
-        $t->set('fmusername', $fm_account->getValue('username', $to_edit));
-        $t->set('fmpassword', $fm_account->getValue('password', $to_edit));
-        $t->set('fmserver', $fm_account->getValue('server', $to_edit));
+	$t->set('fmid', htmlspecialchars($fm_account->getValue('id', $to_edit)));
+	$t->set('fmusername', htmlspecialchars($fm_account->getValue('username', $to_edit)));
+	$t->set('fmpassword', htmlspecialchars($fm_account->getValue('password', $to_edit)));
+	$t->set('fmserver', htmlspecialchars($fm_account->getValue('server', $to_edit)));
         if ($t->get('allowfolders')) {
-            $t->set('fmrmailbox', $fm_account->getValue('rmailbox', $to_edit));
+	    $t->set('fmrmailbox', htmlspecialchars($fm_account->getValue('rmailbox', $to_edit)));
         }
         $t->set('fmonlynew', $fm_account->getValue('onlynew', $to_edit));
         $t->set('fmmarkseen', $fm_account->getValue('markseen', $to_edit));