1 Return-Path: <novalazy@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id D2514431FD2
\r
6 for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:59 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id 0KZogcThshG7 for <notmuch@notmuchmail.org>;
\r
17 Wed, 25 Jul 2012 06:43:59 -0700 (PDT)
\r
18 Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com
\r
19 [209.85.160.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 1842E431FC2
\r
22 for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:57 -0700 (PDT)
\r
23 Received: by mail-pb0-f53.google.com with SMTP id rr13so1767731pbb.26
\r
24 for <notmuch@notmuchmail.org>; Wed, 25 Jul 2012 06:43:56 -0700 (PDT)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
26 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;
\r
27 bh=HCNQ5SLkR8io4tFdlaCGFaOkej/t5dZz19fDDEzzmWk=;
\r
28 b=VRSv5ySDKUCu67MqZa2NGGmKLbDf+g2yhsIw1XBofGiPM+uNIJLWUaQpumwY4mULt7
\r
29 mjAvvuBVTgHBYaUkMb276H99O2Y6YMhSodVpXi8FzVqAFlLuzowJ8CEs1Zaep27I2xHQ
\r
30 c4fNJ0kxXtKo76+bJH1qNjGJ8co271WvEFS7u/Pu47INXLPTBDbPGxj2IRwgHtSqFI/U
\r
31 bxJqP+yIWdclvB2jxp9Wv1y9/9YaJeTeAx9UPPxYqNWuBhEptCZedZfXYhI7xZFUm7IR
\r
32 cqafR0qyI+MdV/ooIqPEMXHNEqs6kwbWwVM2FgV+h019myFul611fv5wNFexTABULXlv
\r
34 Received: by 10.68.241.35 with SMTP id wf3mr47176468pbc.102.1343223836875;
\r
35 Wed, 25 Jul 2012 06:43:56 -0700 (PDT)
\r
36 Received: from localhost (215.42.233.220.static.exetel.com.au.
\r
38 by mx.google.com with ESMTPS id og4sm14410647pbb.48.2012.07.25.06.43.54
\r
39 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Wed, 25 Jul 2012 06:43:56 -0700 (PDT)
\r
41 From: Peter Wang <novalazy@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH 08/18] insert: check folder name
\r
44 Date: Wed, 25 Jul 2012 23:42:37 +1000
\r
45 Message-Id: <1343223767-9812-8-git-send-email-novalazy@gmail.com>
\r
46 X-Mailer: git-send-email 1.7.4.4
\r
47 In-Reply-To: <1343223767-9812-1-git-send-email-novalazy@gmail.com>
\r
48 References: <1343223767-9812-1-git-send-email-novalazy@gmail.com>
\r
49 X-BeenThere: notmuch@notmuchmail.org
\r
50 X-Mailman-Version: 2.1.13
\r
52 List-Id: "Use and development of the notmuch mail system."
\r
53 <notmuch.notmuchmail.org>
\r
54 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
55 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
56 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
57 List-Post: <mailto:notmuch@notmuchmail.org>
\r
58 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
59 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
61 X-List-Received-Date: Wed, 25 Jul 2012 13:44:00 -0000
\r
63 Don't accept folder names containing a ".." component,
\r
64 to prevent writing outside of the maildir.
\r
66 notmuch-insert.c | 20 ++++++++++++++++++++
\r
67 1 files changed, 20 insertions(+), 0 deletions(-)
\r
69 diff --git a/notmuch-insert.c b/notmuch-insert.c
\r
70 index 6398618..ee51a87 100644
\r
71 --- a/notmuch-insert.c
\r
72 +++ b/notmuch-insert.c
\r
76 static notmuch_bool_t
\r
77 +check_folder_name (const char *folder)
\r
79 + const char *p = folder;
\r
81 + /* Check ".." appears nowhere in the folder name. */
\r
83 + if ((p[0] == '.') && (p[1] == '.') && (p[2] == '\0' || p[2] == '/'))
\r
85 + p = strchr (p, '/');
\r
92 +static notmuch_bool_t
\r
93 safe_gethostname (char *hostname, size_t hostname_size)
\r
95 if (gethostname (hostname, hostname_size) == -1) {
\r
96 @@ -232,6 +248,10 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])
\r
97 db_path = notmuch_config_get_database_path (config);
\r
99 if (folder != NULL) {
\r
100 + if (! check_folder_name (folder)) {
\r
101 + fprintf (stderr, "Error: bad folder name: %s\n", folder);
\r
104 maildir = talloc_asprintf (ctx, "%s/%s", db_path, folder);
\r
106 maildir = talloc_asprintf (ctx, "%s", db_path);
\r