OMG - unsanitized shell command. Thanks to Niels Teusink. (CVE-2009-1579)

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@13675 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 234feac5b87f0a4de3b85b3e1ccbd560a99c9bcd..730473d639f012e45ad7f47c420b0b56d0e729df 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -301,6 +301,8 @@ Version 1.5.2 - SVN
   - Fixed the lack of sanitizing of contrib/decrypt_headers.php input;
     also includes general cleanup of that page (Thanks to Niels Teusink).
     [also CVE-2009-1578]
+  - Fixed unsanitized shell command in example IMAP username mapping
+    function (map_yp_alias) (Thanks to Niels Teusink). [CVE-2009-1579]
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------

diff --git a/functions/imap_general.php b/functions/imap_general.php
index d81192a7a9a67b7000e12a15f2b39b8aefe8475c..0121a21002998256607debe03972ddde0b685199 100755 (executable)
--- a/functions/imap_general.php
+++ b/functions/imap_general.php
@@ -1436,6 +1436,6 @@ function sqimap_get_user_server ($imap_server, $username) {
  * @since 1.3.0
  */
 function map_yp_alias($username) {
-   $yp = `ypmatch $username aliases`;
+   $yp = `ypmatch ' . escapeshellarg($username) . ' aliases`;
    return chop(substr($yp, strlen($username)+1));
 }