From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0KBNI24RbWDWHgEAgWs5BA (envelope-from ) for ; Wed, 07 Apr 2021 03:57:02 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id gHstHW4RbWAYNwAAB5/wlQ (envelope-from ) for ; Wed, 07 Apr 2021 01:57:02 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 06F0BA0BF for ; Wed, 7 Apr 2021 03:57:02 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 33D7E2907D; Tue, 6 Apr 2021 21:56:15 -0400 (EDT) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id B837D29033 for ; Tue, 6 Apr 2021 21:55:48 -0400 (EDT) Received: by fethera.tethera.net (Postfix, from userid 1001) id AFF875FA96; Tue, 6 Apr 2021 21:55:48 -0400 (EDT) Received: (nullmailer pid 2964221 invoked by uid 1000); Wed, 07 Apr 2021 01:55:35 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 08/28] lib/config: set defaults for user full name Date: Tue, 6 Apr 2021 22:55:10 -0300 Message-Id: <20210407015530.2964017-9-david@tethera.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210407015530.2964017-1-david@tethera.net> References: <20210407015530.2964017-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: 4G5VQKQF32IN5MMIWXHI6XPQF5MU4ETG X-Message-ID-Hash: 4G5VQKQF32IN5MMIWXHI6XPQF5MU4ETG X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1617760622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=V6A4ulUourhyOHqpIy4GuUr/MlKfjghY5Zx8S+fywE4=; b=mTjUoA7v/tPglPagCQI+3cWOhfHmfzTWkqfko4HKt0BB29F2lAnC4N32vkP6TF/pY8BAlp 2Qwy8lMur+b32YY86mok1CQ1h9b/3iTQm+4FEjrOz0f5CqrpupIa8r/IqUIAqueM3F3N0l Vz2lU8mC2ivWKIgpK+NCiSZrP2nVYym29rr9+nUN2Un01siTaWBfwhWdvsY4vMFMNk/yR5 SFFGpYQdI/TUqPxtzL1Raw9tlzscYaXqmXBs6EcjP03OUTe4ymO7ia6+Y6CVHOMwGWD+nn pGJ+MRsLDLXbpUHwPdW4NPvrHRYXtKBc3QOWGE4rAtfHea2yVZ7pxe/jLv21kQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617760622; a=rsa-sha256; cv=none; b=hyNeSIhxdEc+Q3AZ6dKYTUx36ypr71CjlYTEqagqk6MaHNUkL9u0TXarq1JMtvClcH5zIt AFBKFN52StB0WZ67PelSU/9LqReFD/x3EKM3yYiWCcNt2VmAmRjkR4OD4ELBn0Z6hnKbFX sA8TtQsRYPOEAzgTNMXi5vlJ94jFmSk4eXDGgNK9w7mvqNg01tdV5qItvJqK1SRmfFjnaJ xjHfK/ft/1YlUJRyUcoW3X0zwbk2SsJ9AHONWQjvC0xqLTY5Bog4k6M9f6At7U3jayCmop uUZMPKAjkqS8nNhBtrac6XJSLUfQRf9sdzAsj4hRFSo2snDJHENnCNvVU0wYFg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -0.99 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 06F0BA0BF X-Spam-Score: -0.99 X-Migadu-Scanner: scn0.migadu.com X-TUID: WLepSizwUMbi This just copies code from from the CLI into the library. New test infrastructure is needed because apparently we have never tested this code path. --- lib/config.cc | 48 +++++++++++++++++++++++++++++++++++++++++- test/T590-libconfig.sh | 13 ++++++++---- test/test-lib.sh | 7 ++++++ 3 files changed, 63 insertions(+), 5 deletions(-) diff --git a/lib/config.cc b/lib/config.cc index ab45ae7b..38416632 100644 --- a/lib/config.cc +++ b/lib/config.cc @@ -22,6 +22,8 @@ #include "notmuch-private.h" #include "database-private.h" +#include + static const std::string CONFIG_PREFIX = "C"; struct _notmuch_config_list { @@ -451,6 +453,41 @@ notmuch_config_get_bool (notmuch_database_t *notmuch, notmuch_config_key_t key, return NOTMUCH_STATUS_SUCCESS; } +static const char * +_get_name_from_passwd_file (void *ctx) +{ + long pw_buf_size; + char *pw_buf; + struct passwd passwd, *ignored; + const char *name; + int e; + + pw_buf_size = sysconf (_SC_GETPW_R_SIZE_MAX); + if (pw_buf_size == -1) pw_buf_size = 64; + pw_buf = (char *) talloc_size (ctx, pw_buf_size); + + while ((e = getpwuid_r (getuid (), &passwd, pw_buf, + pw_buf_size, &ignored)) == ERANGE) { + pw_buf_size = pw_buf_size * 2; + pw_buf = (char *) talloc_zero_size (ctx, pw_buf_size); + } + + if (e == 0) { + char *comma = strchr (passwd.pw_gecos, ','); + if (comma) + name = talloc_strndup (ctx, passwd.pw_gecos, + comma - passwd.pw_gecos); + else + name = talloc_strdup (ctx, passwd.pw_gecos); + } else { + name = talloc_strdup (ctx, ""); + } + + talloc_free (pw_buf); + + return name; +} + static const char * _notmuch_config_key_to_string (notmuch_config_key_t key) { @@ -486,6 +523,7 @@ static const char * _notmuch_config_default (notmuch_database_t *notmuch, notmuch_config_key_t key) { char *path; + const char *name; switch (key) { case NOTMUCH_CONFIG_DATABASE_PATH: @@ -505,10 +543,18 @@ _notmuch_config_default (notmuch_database_t *notmuch, notmuch_config_key_t key) return "inbox;unread"; case NOTMUCH_CONFIG_SYNC_MAILDIR_FLAGS: return "true"; + case NOTMUCH_CONFIG_USER_NAME: + name = getenv ("NAME"); + if (name) + name = talloc_strdup (notmuch, name); + else + name = _get_name_from_passwd_file (notmuch); + + return name; + break; case NOTMUCH_CONFIG_HOOK_DIR: case NOTMUCH_CONFIG_BACKUP_DIR: case NOTMUCH_CONFIG_NEW_IGNORE: - case NOTMUCH_CONFIG_USER_NAME: case NOTMUCH_CONFIG_PRIMARY_EMAIL: case NOTMUCH_CONFIG_OTHER_EMAIL: return NULL; diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh index 49cc382a..2c6e726c 100755 --- a/test/T590-libconfig.sh +++ b/test/T590-libconfig.sh @@ -384,6 +384,9 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} '' %NULL% } } EOF + +notmuch_passwd_sanitize < OUTPUT > OUTPUT.clean + cat <<'EOF' >EXPECTED == stdout == MAIL_DIR @@ -396,11 +399,11 @@ NULL true NULL NULL -NULL +USER_FULL_NAME == stderr == EOF unset MAILDIR -test_expect_equal_file EXPECTED OUTPUT +test_expect_equal_file EXPECTED OUTPUT.clean backup_database test_begin_subtest "override config from \${NOTMUCH_CONFIG}" @@ -727,6 +730,8 @@ cat c_head2 - c_tail <<'EOF' | test_C ${MAIL_DIR} /nonexistent %NULL% } } EOF + +notmuch_passwd_sanitize < OUTPUT > OUTPUT.clean cat <<'EOF' >EXPECTED == stdout == MAIL_DIR @@ -739,10 +744,10 @@ NULL true NULL NULL -NULL +USER_FULL_NAME == stderr == EOF -test_expect_equal_file EXPECTED OUTPUT +test_expect_equal_file EXPECTED OUTPUT.clean backup_database test_begin_subtest "override config from \${HOME}/.notmuch-config (ndlc)" diff --git a/test/test-lib.sh b/test/test-lib.sh index fc176af8..fa2e401e 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -694,6 +694,13 @@ notmuch_built_with_sanitize () sed 's/^built_with[.]\(.*\)=.*$/built_with.\1=something/' } +notmuch_passwd_sanitize () +{ + local user=$(id -un) + local full_name=$(getent passwd $user | cut -d: -f 5 | cut -d, -f1) + sed "s/$full_name/USER_FULL_NAME/" +} + notmuch_config_sanitize () { notmuch_dir_sanitize | notmuch_built_with_sanitize -- 2.30.2