[PATCH 08/18] insert: check folder name

diff --git a/8d/5f7f1524874278a6f3bc03b13ed60b25cc9af9 b/8d/5f7f1524874278a6f3bc03b13ed60b25cc9af9
new file mode 100644 (file)
index 0000000..2d12292
--- /dev/null
+++ b/8d/5f7f1524874278a6f3bc03b13ed60b25cc9af9
@@ -0,0 +1,109 @@
+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 D2514431FD2\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:59 -0700 (PDT)\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 0KZogcThshG7 for <notmuch@notmuchmail.org>;\r
+       Wed, 25 Jul 2012 06:43:59 -0700 (PDT)\r
+Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com\r
+       [209.85.160.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 1842E431FC2\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:57 -0700 (PDT)\r
+Received: by mail-pb0-f53.google.com with SMTP id rr13so1767731pbb.26\r
+       for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:56 -0700 (PDT)\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=HCNQ5SLkR8io4tFdlaCGFaOkej/t5dZz19fDDEzzmWk=;\r
+       b=VRSv5ySDKUCu67MqZa2NGGmKLbDf+g2yhsIw1XBofGiPM+uNIJLWUaQpumwY4mULt7\r
+       mjAvvuBVTgHBYaUkMb276H99O2Y6YMhSodVpXi8FzVqAFlLuzowJ8CEs1Zaep27I2xHQ\r
+       c4fNJ0kxXtKo76+bJH1qNjGJ8co271WvEFS7u/Pu47INXLPTBDbPGxj2IRwgHtSqFI/U\r
+       bxJqP+yIWdclvB2jxp9Wv1y9/9YaJeTeAx9UPPxYqNWuBhEptCZedZfXYhI7xZFUm7IR\r
+       cqafR0qyI+MdV/ooIqPEMXHNEqs6kwbWwVM2FgV+h019myFul611fv5wNFexTABULXlv\r
+       c9cQ==\r
+Received: by 10.68.241.35 with SMTP id wf3mr47176468pbc.102.1343223836875;\r
+       Wed, 25 Jul 2012 06:43:56 -0700 (PDT)\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 og4sm14410647pbb.48.2012.07.25.06.43.54\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 25 Jul 2012 06:43:56 -0700 (PDT)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 08/18] insert: check folder name\r
+Date: Wed, 25 Jul 2012 23:42:37 +1000\r
+Message-Id: <1343223767-9812-8-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.4.4\r
+In-Reply-To: <1343223767-9812-1-git-send-email-novalazy@gmail.com>\r
+References: <1343223767-9812-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: Wed, 25 Jul 2012 13:44:00 -0000\r
+\r
+Don't accept folder names containing a ".." component,\r
+to prevent writing outside of the maildir.\r
+---\r
+ notmuch-insert.c |   20 ++++++++++++++++++++\r
+ 1 files changed, 20 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index 6398618..ee51a87 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -25,6 +25,22 @@\r
+ #include <fcntl.h>\r
+ \r
+ static notmuch_bool_t\r
++check_folder_name (const char *folder)\r
++{\r
++    const char *p = folder;\r
++\r
++    /* Check ".." appears nowhere in the folder name. */\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
++static notmuch_bool_t\r
+ safe_gethostname (char *hostname, size_t hostname_size)\r
+ {\r
+     if (gethostname (hostname, hostname_size) == -1) {\r
+@@ -232,6 +248,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.4.4\r
+\r