From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id uMk9NgQ9MWDHYAAA0tVLHw (envelope-from ) for ; Sat, 20 Feb 2021 16:47:00 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id KG4AMgQ9MWAdagAAB5/wlQ (envelope-from ) for ; Sat, 20 Feb 2021 16:47:00 +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)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4A6D727985 for ; Sat, 20 Feb 2021 17:47:00 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 07ADE27558; Sat, 20 Feb 2021 11:45:57 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id A802B26BEC for ; Sat, 20 Feb 2021 11:45:14 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id A025160666; Sat, 20 Feb 2021 11:45:14 -0500 (EST) Received: (nullmailer pid 3956174 invoked by uid 1000); Sat, 20 Feb 2021 16:44:54 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 07/18] lib/config: set defaults for user full name Date: Sat, 20 Feb 2021 12:44:37 -0400 Message-Id: <20210220164448.3956011-8-david@tethera.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210220164448.3956011-1-david@tethera.net> References: <20210220164448.3956011-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: DDWXPFNTEJV2C27O2QURUEZE2VRHIPCD X-Message-ID-Hash: DDWXPFNTEJV2C27O2QURUEZE2VRHIPCD 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 X-Migadu-Spam-Score: 0.48 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: 4A6D727985 X-Spam-Score: 0.48 X-Migadu-Scanner: scn1.migadu.com X-TUID: ORYzPbAcx/yK 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 490cb1c3..d07aac5e 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 { @@ -430,6 +432,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) { switch (key) { @@ -463,6 +500,7 @@ _notmuch_config_key_to_string (notmuch_config_key_t key) { 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: @@ -482,10 +520,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 c93c2859..95538bba 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 29baa0c1..e881dc40 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.0