Re: [PATCH 7/9] add a gpg_path value for notmuch_database_t

diff --git a/03/59d7b6fde3b83d85394eefaba17a55838c41aa b/03/59d7b6fde3b83d85394eefaba17a55838c41aa
new file mode 100644 (file)
index 0000000..2d6e47d
--- /dev/null
+++ b/03/59d7b6fde3b83d85394eefaba17a55838c41aa
@@ -0,0 +1,147 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 4CD1E6DE0A9A\r
+ for <notmuch@notmuchmail.org>; Fri, 11 Dec 2015 14:02:24 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.699\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.699 tagged_above=-999 required=5 tests=[AWL=0.047, \r
+ SPF_NEUTRAL=0.652] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id lVfFyy-93Ylm for <notmuch@notmuchmail.org>;\r
+ Fri, 11 Dec 2015 14:02:22 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 85A476DE005F\r
+ for <notmuch@notmuchmail.org>; Fri, 11 Dec 2015 14:02:22 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id 234BB100218;\r
+ Sat, 12 Dec 2015 00:02:33 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Daniel Kahn Gillmor <dkg@fifthhorseman.net>,\r
+ Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: Re: [PATCH 7/9] add a gpg_path value for notmuch_database_t\r
+In-Reply-To: <1449718786-28000-8-git-send-email-dkg@fifthhorseman.net>\r
+References: <1449718786-28000-1-git-send-email-dkg@fifthhorseman.net>\r
+ <1449718786-28000-8-git-send-email-dkg@fifthhorseman.net>\r
+User-Agent: Notmuch/0.21+32~g73439f8 (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sat, 12 Dec 2015 00:02:33 +0200\r
+Message-ID: <m21tas7ifa.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 11 Dec 2015 22:02:24 -0000\r
+\r
+On Thu, Dec 10 2015, Daniel Kahn Gillmor <dkg@fifthhorseman.net> wrote:\r
+\r
+> Exposing this to the user of the library lets the user point to\r
+> arbitrary gpg executables when trying to decrypt.\r
+> ---\r
+>  lib/database-private.h |  3 ++\r
+>  lib/database.cc        | 93 +++++++++++++++++++++++++++++++++++++++++++-------\r
+>  lib/notmuch.h          | 31 +++++++++++++++++\r
+>  3 files changed, 115 insertions(+), 12 deletions(-)\r
+>\r
+......\r
+\r
+> +\r
+> +static notmuch_bool_t\r
+> +_find_in_path(const char* path)\r
+> +{\r
+> +    char *c = NULL, *save = NULL, *tok;\r
+> +    size_t n;\r
+> +    int dfd = -1;\r
+> +    notmuch_bool_t ret = FALSE;\r
+> +    \r
+> +    n = confstr(_CS_PATH, NULL, 0);\r
+> +    c = (char*)talloc_size(NULL, n);\r
+> +    if (!c)\r
+> +    return FALSE;\r
+> +    confstr(_CS_PATH, c, n);\r
+> +\r
+> +    tok = strtok_r(c, ":", &save);\r
+> +    while (tok) {\r
+> +    dfd = open(tok, O_DIRECTORY | O_RDONLY);\r
+> +    if (dfd != -1) {\r
+> +        if (!faccessat(dfd, path, X_OK, 0)) {\r
+> +            ret = TRUE;\r
+> +            goto done;\r
+> +        }\r
+> +        close(dfd);\r
+> +    }\r
+> +    tok = strtok_r(NULL, ":", &save);\r
+> +    }\r
+\r
+The above code finds gpg/gpg2 (when called w/ these args) from\r
+_CS_PATH (seems to be /bin:/usr/bin by default in linux (tried to\r
+look how this set in *BSD -- initially it looks like /usr/local/bin\r
+not included but... maybe we let them to complain if this is the case\r
+... :/)\r
+... anyway, the full found path is not set anywhere -- how is it found\r
+when used (exec*p() using $PATH? :O)\r
+\r
+> +done:\r
+> +    if (dfd != -1)\r
+> +    close(dfd);\r
+> +    if (c)\r
+> +    talloc_free(c);\r
+> +    return ret;\r
+> +}\r
+> +\r
+> +notmuch_status_t\r
+> +notmuch_database_set_gpg_path (notmuch_database_t *notmuch, const char* path)\r
+> +{\r
+> +    /* return success if this matches what is already configured */\r
+> +    if ((!path && !notmuch->gpg_path) ||\r
+> +    (path && notmuch->gpg_path && 0 == strcmp(path, notmuch->gpg_path)))\r
+> +    return NOTMUCH_STATUS_SUCCESS;\r
+> +    \r
+> +    if (!path && !_find_in_path(path))\r
+> +    return NOTMUCH_STATUS_FILE_ERROR;\r
+> +\r
+> +    /* clear any existing gpg_crypto_ctx, since things are changing */\r
+> +    if (notmuch->gpg_crypto_ctx) {\r
+> +    g_object_unref (notmuch->gpg_crypto_ctx);\r
+> +    notmuch->gpg_crypto_ctx = NULL;\r
+> +    }\r
+> +\r
+> +    if (notmuch->gpg_path) {\r
+> +    talloc_free(notmuch->gpg_path);\r
+> +    notmuch->gpg_path = NULL;\r
+> +    }\r
+> +\r
+> +    if (path)\r
+> +    notmuch->gpg_path = talloc_strdup (notmuch, path);\r
+> +    \r
+> +    return NOTMUCH_STATUS_SUCCESS;\r
+> +}\r
+> +\r
+> +const char*\r
+> +notmuch_database_get_gpg_path (const notmuch_database_t *notmuch)\r
+> +{\r
+> +    if (notmuch->gpg_path)\r
+> +    return notmuch->gpg_path;\r
+> +\r
+> +#define try_gpg_path(z) if (_find_in_path(z)) return z\r
+> +    try_gpg_path("gpg2");\r
+> +    try_gpg_path("gpg");\r
+> +    return NULL;\r
+> +}\r