From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id MDNjG688MWDMZwAA0tVLHw (envelope-from ) for ; Sat, 20 Feb 2021 16:45:35 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id WHE4F688MWBoUwAA1q6Kng (envelope-from ) for ; Sat, 20 Feb 2021 16:45:35 +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 014B41ED64 for ; Sat, 20 Feb 2021 17:45:35 +0100 (CET) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id F0B2F26AD7; Sat, 20 Feb 2021 11:45:04 -0500 (EST) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 8D43726ACE for ; Sat, 20 Feb 2021 11:44:58 -0500 (EST) Received: by fethera.tethera.net (Postfix, from userid 1001) id 419836066F; Sat, 20 Feb 2021 11:44:58 -0500 (EST) Received: (nullmailer pid 3956178 invoked by uid 1000); Sat, 20 Feb 2021 16:44:54 -0000 From: David Bremner To: notmuch@notmuchmail.org Cc: David Bremner Subject: [PATCH 08/18] lib/config: set default for primary user email Date: Sat, 20 Feb 2021 12:44:38 -0400 Message-Id: <20210220164448.3956011-9-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: BOCRT267XZTOZPZIB4XWIG4BRVOE4BL2 X-Message-ID-Hash: BOCRT267XZTOZPZIB4XWIG4BRVOE4BL2 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: 014B41ED64 X-Spam-Score: 0.48 X-Migadu-Scanner: scn0.migadu.com X-TUID: heWxKoR7XRl7 This is mainly copying code from the CLI into the lib. The CLI copy will be deleted in a later commit. --- lib/config.cc | 70 +++++++++++++++++++++++++++++++++++++++--- test/T590-libconfig.sh | 4 +-- test/test-lib.sh | 6 +++- 3 files changed, 73 insertions(+), 7 deletions(-) diff --git a/lib/config.cc b/lib/config.cc index d07aac5e..03ba2731 100644 --- a/lib/config.cc +++ b/lib/config.cc @@ -23,6 +23,7 @@ #include "database-private.h" #include +#include static const std::string CONFIG_PREFIX = "C"; @@ -467,6 +468,63 @@ _get_name_from_passwd_file (void *ctx) return name; } +static char * +_get_username_from_passwd_file (void *ctx) +{ + long pw_buf_size; + char *pw_buf; + struct passwd passwd, *ignored; + 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_zero_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) + name = talloc_strdup (ctx, passwd.pw_name); + else + name = talloc_strdup (ctx, ""); + + talloc_free (pw_buf); + + return name; +} + +static const char * +_get_email_from_passwd_file (void *ctx) +{ + + char hostname[256]; + struct hostent *hostent; + const char *domainname; + char *email; + + char *username = _get_username_from_passwd_file (ctx); + + gethostname (hostname, 256); + hostname[255] = '\0'; + + hostent = gethostbyname (hostname); + if (hostent && (domainname = strchr (hostent->h_name, '.'))) + domainname += 1; + else + domainname = "(none)"; + + email = talloc_asprintf (ctx, "%s@%s.%s", + username, hostname, domainname); + + talloc_free (username); + talloc_free (email); + return email; +} + static const char * _notmuch_config_key_to_string (notmuch_config_key_t key) { switch (key) { @@ -500,7 +558,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; + const char *name, *email; switch (key) { case NOTMUCH_CONFIG_DATABASE_PATH: @@ -526,13 +584,17 @@ _notmuch_config_default (notmuch_database_t *notmuch, notmuch_config_key_t key) name = talloc_strdup (notmuch, name); else name = _get_name_from_passwd_file (notmuch); - return name; - break; + case NOTMUCH_CONFIG_PRIMARY_EMAIL: + email = getenv ("EMAIL"); + if (email) + email = talloc_strdup (notmuch, email); + else + email = _get_email_from_passwd_file (notmuch); + return email; case NOTMUCH_CONFIG_HOOK_DIR: case NOTMUCH_CONFIG_BACKUP_DIR: case NOTMUCH_CONFIG_NEW_IGNORE: - case NOTMUCH_CONFIG_PRIMARY_EMAIL: case NOTMUCH_CONFIG_OTHER_EMAIL: return NULL; default: diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh index 95538bba..01a9ac06 100755 --- a/test/T590-libconfig.sh +++ b/test/T590-libconfig.sh @@ -397,7 +397,7 @@ MAIL_DIR/.notmuch/backups inbox;unread NULL true -NULL +USERNAME@FQDN NULL USER_FULL_NAME == stderr == @@ -742,7 +742,7 @@ MAIL_DIR/.notmuch/backups inbox;unread NULL true -NULL +USERNAME@FQDN NULL USER_FULL_NAME == stderr == diff --git a/test/test-lib.sh b/test/test-lib.sh index e881dc40..cb27cb78 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -107,6 +107,9 @@ unset GREP_OPTIONS # For emacsclient unset ALTERNATE_EDITOR +# for reproducibility +unset EMAIL + add_gnupg_home () { [ -e "${GNUPGHOME}/gpg.conf" ] && return @@ -697,8 +700,9 @@ notmuch_built_with_sanitize () notmuch_passwd_sanitize () { local user=$(id -un) + local fqdn=$(hostname -f) local full_name=$(getent passwd $user | cut -d: -f 5 | cut -d, -f1) - sed "s/$full_name/USER_FULL_NAME/" + sed -e "s/$user/USERNAME/" -e "s/$fqdn/FQDN/" -e "s/$full_name/USER_FULL_NAME/" } notmuch_config_sanitize () -- 2.30.0