[PATCH v2 09/20] insert: prevent writes outside Maildir hierarchy

diff --git a/66/1f7a5dcabd890852b34ef48337f9c38454c418 b/66/1f7a5dcabd890852b34ef48337f9c38454c418
new file mode 100644 (file)
index 0000000..0855a4e
--- /dev/null
+++ b/66/1f7a5dcabd890852b34ef48337f9c38454c418
@@ -0,0 +1,110 @@
+Return-Path: <novalazy@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 94D45431FAF\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:56 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 9FVrlOmsE62o for <notmuch@notmuchmail.org>;\r
+       Sat, 24 Nov 2012 17:17:56 -0800 (PST)\r
+Received: from mail-da0-f53.google.com (mail-da0-f53.google.com\r
+       [209.85.210.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 247F7431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:56 -0800 (PST)\r
+Received: by mail-da0-f53.google.com with SMTP id x6so2305796dac.26\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Nov 2012 17:17:55 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=xIoOTrPF204aON5fO76DkSt406Ccng0pbsk1vL/X2cw=;\r
+       b=QVmIN+7jCR/Gr35rlvVb6ymIIP8wEi3CCDEQv/rPcGbQTdw+Pcce5jMed2gMo3eb/w\r
+       iUXnK+3Mnjb9PxVxqbsJxBnJBJ9xUu21rhdIMjKZrPiyffC4Yw0bT2B8ECrdSkglWpDi\r
+       b5dGg2GnKPA+pX2J2zwREx6otNozxvg4tT/FkBmNPLWRr4o22bsfjvwQ2U8B4ZOanAEy\r
+       pBkSwe8YLHXFqxDrmc2ioVng+YgOVHi6zOkIAyuaE0OIhVRpjrSdTKNlT08NQi6VSkWV\r
+       eCsiqOm+a27wHDJ8UB12CM28BIKiPA0v9AOfPHk6gZqF5fJ6+zN4wab2UMcBAaalRcDv\r
+       eAfA==\r
+Received: by 10.69.0.40 with SMTP id av8mr26370390pbd.117.1353806275387;\r
+       Sat, 24 Nov 2012 17:17:55 -0800 (PST)\r
+Received: from localhost (215.42.233.220.static.exetel.com.au.\r
+       [220.233.42.215])\r
+       by mx.google.com with ESMTPS id i10sm6169840paz.17.2012.11.24.17.17.52\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 24 Nov 2012 17:17:54 -0800 (PST)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 09/20] insert: prevent writes outside Maildir hierarchy\r
+Date: Sun, 25 Nov 2012 12:16:35 +1100\r
+Message-Id: <1353806206-29133-10-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.12.1\r
+In-Reply-To: <1353806206-29133-1-git-send-email-novalazy@gmail.com>\r
+References: <1353806206-29133-1-git-send-email-novalazy@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 25 Nov 2012 01:17:56 -0000\r
+\r
+Don't accept a --folder name that contains a ".." component,\r
+in order to prevent writing outside of the Maildir hierarchy.\r
+---\r
+ notmuch-insert.c | 21 +++++++++++++++++++++\r
+ 1 file changed, 21 insertions(+)\r
+\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index a50eacc..022f7cd 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -38,6 +38,23 @@ safe_gethostname (char *hostname, size_t len)\r
+     return (strchr (hostname, '/') == NULL);\r
+ }\r
+ \r
++/* Check the specified folder name does not contain a directory\r
++ * component ".." to prevent writes outside of the Maildir hierarchy. */\r
++static notmuch_bool_t\r
++check_folder_name (const char *folder)\r
++{\r
++    const char *p = folder;\r
++\r
++    for (;;) {\r
++      if ((p[0] == '.') && (p[1] == '.') && (p[2] == '\0' || p[2] == '/'))\r
++          return FALSE;\r
++      p = strchr (p, '/');\r
++      if (!p)\r
++          return TRUE;\r
++      p++;\r
++    }\r
++}\r
++\r
+ /* Open a unique file in the Maildir 'tmp' directory.\r
+  * Returns the file descriptor on success, or -1 on failure.\r
+  * On success, file paths into the 'tmp' and 'new' directories are returned\r
+@@ -255,6 +272,10 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])\r
+     db_path = notmuch_config_get_database_path (config);\r
+ \r
+     if (folder != NULL) {\r
++      if (! check_folder_name (folder)) {\r
++          fprintf (stderr, "Error: bad folder name: %s\n", folder);\r
++          return 1;\r
++      }\r
+       maildir = talloc_asprintf (ctx, "%s/%s", db_path, folder);\r
+     } else {\r
+       maildir = talloc_asprintf (ctx, "%s", db_path);\r
+-- \r
+1.7.12.1\r
+\r