lib: consolidate duplicated EMAIL_ADDR construction logic

Fixes: gromox-2.22-19-gf13994811
Fixes: gromox-2.28-27-g60c949541
References: GXF-1673

Author: jengelh

exch/midb/mail_engine.cpp

@@ -1331,7 +1331,6 @@ static void mail_engine_extract_digest_fields(const Json::Value &digest, char *s
 	size_t out_len;
 	char temp_buff[64*1024];
 	char temp_buff1[64*1024];
-	EMAIL_ADDR temp_address;
 
 	subject[0] = '\0';
 	if (get_digest(digest, "subject", temp_buff, std::size(temp_buff)) &&
@@ -1342,8 +1341,7 @@ static void mail_engine_extract_digest_fields(const Json::Value &digest, char *s
 	if (get_digest(digest, "from", temp_buff, std::size(temp_buff)) &&
 	    decode64(temp_buff, strlen(temp_buff), temp_buff1,
 	    std::size(temp_buff1), &out_len) == 0) {
-		memset(&temp_address, 0, sizeof(temp_address));
-		parse_mime_addr(&temp_address, temp_buff1);
+		EMAIL_ADDR temp_address(temp_buff1);
 		gx_strlcpy(from, temp_address.addr, fromsize);
 	}
 	rcpt[0] = '\0';
@@ -1358,8 +1356,7 @@ static void mail_engine_extract_digest_fields(const Json::Value &digest, char *s
 			}
 		}
 		HX_strrtrim(temp_buff1);
-		memset(&temp_address, 0, sizeof(temp_address));
-		parse_mime_addr(&temp_address, temp_buff1);
+		EMAIL_ADDR temp_address(temp_buff1);
 		gx_strlcpy(rcpt, temp_address.addr, rcptsize);
 	}
 	*psize = 0;

include/gromox/mail_func.hpp

@@ -6,6 +6,7 @@
 #include <ctime>
 #include <string>
 #include <vector>
+#include <vmime/mailbox.hpp>
 #include <vmime/message.hpp>
 #include <gromox/mapi_types.hpp>
 #define MIME_NAME_LEN 80U
@@ -17,6 +18,12 @@ struct attachment_list;
  * All fields are always UTF-8 for consistency.
  */
 struct GX_EXPORT EMAIL_ADDR {
+	EMAIL_ADDR() = default;
+	EMAIL_ADDR(const char *x) { parse(x); }
+	EMAIL_ADDR(const vmime::mailbox &x) { set(x); }
+	void clear();
+	void set(const vmime::mailbox &);
+	void parse(const char *);
 	inline bool has_dispname() const { return *display_name != '\0'; }
 	inline bool has_addr() const { return *local_part != '\0' && *domain != '\0'; }
 	inline bool has_value() const { return has_dispname() || has_addr(); }
@@ -36,7 +43,6 @@ struct ENCODE_STRING {
 };
 
 struct MAIL;
-extern GX_EXPORT void parse_mime_addr(EMAIL_ADDR *e_addr, const char *email);
 extern GX_EXPORT BOOL parse_uri(const char *uri_buff, char *parsed_uri);
 extern GX_EXPORT size_t parse_mime_field(const char *, size_t, MIME_FIELD *);
 extern GX_EXPORT void parse_field_value(const char *in_buff, long buff_len, char *value, long val_len, std::vector<kvpair> &);

lib/email/mjson.cpp

@@ -652,11 +652,10 @@ static int mjson_convert_address(const char *address, const char *charset,
 {
 	int offset;
 	size_t ecode_len;
-	EMAIL_ADDR email_addr;
 	char temp_buff[2048];
 
 	offset = 0;
-	parse_mime_addr(&email_addr, address);
+	EMAIL_ADDR email_addr(address);
 	if (*email_addr.display_name == '\0') {
 		memcpy(buff + offset, "(NIL", 4);
 		offset += 4;

lib/mail_func.cpp

@@ -255,30 +255,40 @@ BOOL parse_uri(const char *uri_buff, char *parsed_uri)
     return TRUE;
 }
 
-/*
- *	  parse email address in mime field into e_addr
- *	  @param
- *		  email	 [in]	  string contain the address
- *		  e_addr [out]	  for retrieving parsed address
- */
-void parse_mime_addr(EMAIL_ADDR *e_addr, const char *input) try
+void EMAIL_ADDR::clear()
 {
-	vmime::mailbox mb("");
-	mb.parse(input);
+	memset(this, 0, sizeof(*this));
+}
+
+void EMAIL_ADDR::set(const vmime::mailbox &mb) try
+{
+	auto e_addr = this;
 
 	gx_strlcpy(e_addr->display_name, mb.getName().getConvertedText("utf-8").c_str(), std::size(e_addr->display_name));
 	auto emp = mb.getEmail().generate();
 	gx_strlcpy(e_addr->addr, emp.c_str(), std::size(e_addr->addr));
 	auto at  = emp.find('@');
 	if (at == emp.npos) {
-		*e_addr = {};
+		clear();
 		return;
 	}
 	emp[at] = '\0';
 	gx_strlcpy(e_addr->local_part, &emp[0], std::size(e_addr->local_part));
 	gx_strlcpy(e_addr->domain, &emp[at+1], std::size(e_addr->domain));
 } catch (const std::bad_alloc &) {
-	*e_addr = {};
+	clear();
+}
+
+/**
+ * @input: whatever is normally allowed in the From header value
+ */
+void EMAIL_ADDR::parse(const char *input) try
+{
+	vmime::mailbox mb("");
+	mb.parse(input);
+	set(mb);
+} catch (const std::bad_alloc &) {
+	clear();
 }
 
 /*

lib/mapi/oxcmail.cpp

@@ -448,8 +448,6 @@ static BOOL oxcmail_parse_recipient(const char *charset,
 static BOOL oxcmail_parse_addresses(const char *charset, const char *field,
     uint32_t rcpt_type, TARRAY_SET *pset) try
 {
-	EMAIL_ADDR email_addr;
-
 	vmime::mailboxList mblist;
 	try {
 		mblist.parse(field);
@@ -461,16 +459,7 @@ static BOOL oxcmail_parse_addresses(const char *charset, const char *field,
 		auto mb = vmime::dynamicCast<vmime::mailbox>(compo);
 		if (mb == nullptr)
 			continue;
-		gx_strlcpy(email_addr.display_name, mb->getName().getConvertedText("utf-8").c_str(), std::size(email_addr.display_name));
-		auto emp = mb->getEmail().generate();
-		gx_strlcpy(email_addr.addr, emp.c_str(), std::size(email_addr.addr));
-		auto at  = emp.find('@');
-		if (at == emp.npos)
-			continue;
-		emp[at] = '\0';
-		gx_strlcpy(email_addr.local_part, &emp[0], std::size(email_addr.local_part));
-		gx_strlcpy(email_addr.domain, &emp[at+1], std::size(email_addr.domain));
-
+		EMAIL_ADDR email_addr(*mb);
 		if (!email_addr.has_addr())
 			continue;
 		if (!oxcmail_parse_recipient(charset,
@@ -487,8 +476,7 @@ static BOOL oxcmail_parse_address(const char *field, uint32_t pr_name,
     uint32_t pr_addrtype, uint32_t pr_emaddr, uint32_t pr_smtpaddr,
     uint32_t pr_searchkey, uint32_t pr_entryid, TPROPVAL_ARRAY *pproplist) try
 {
-	EMAIL_ADDR email_addr, *paddr = &email_addr;
-	parse_mime_addr(&email_addr, field);
+	EMAIL_ADDR email_addr(field), *paddr = &email_addr;
 
 	if (paddr->has_dispname()) {
 		if (pproplist->set(pr_name, paddr->display_name) != 0)
@@ -566,16 +554,7 @@ static BOOL oxcmail_parse_reply_to(const char *charset, const char *field,
 		auto mb = vmime::dynamicCast<vmime::mailbox>(compo);
 		if (mb == nullptr)
 			continue;
-		gx_strlcpy(email_addr.display_name, mb->getName().getConvertedText("utf-8").c_str(), std::size(email_addr.display_name));
-		auto emp = mb->getEmail().generate();
-		gx_strlcpy(email_addr.addr, emp.c_str(), std::size(email_addr.addr));
-		auto at  = emp.find('@');
-		if (at == emp.npos)
-			continue;
-		emp[at] = '\0';
-		gx_strlcpy(email_addr.local_part, &emp[0], std::size(email_addr.local_part));
-		gx_strlcpy(email_addr.domain, &emp[at+1], std::size(email_addr.domain));
-
+		email_addr.set(*mb);
 		if (!email_addr.has_addr())
 			continue;
 		snprintf(tmp_buff, std::size(tmp_buff), "%s@%s",

mda/smtp/smtp_cmd_handler.cpp

@@ -127,7 +127,6 @@ int smtp_cmd_handler_mail(const char* cmd_line, int line_length,
 	size_t string_length = 0;
     const char *smtp_reply_str, *smtp_reply_str2;
     char buff[1024], buff2[1024];
-    EMAIL_ADDR email_addr;    
 
 	if (line_length <= 10 || 0 != strncasecmp(cmd_line + 4, " FROM:", 6))
 		/* syntax error or arguments error*/
@@ -141,7 +140,7 @@ int smtp_cmd_handler_mail(const char* cmd_line, int line_length,
 	if (g_param.support_starttls && g_param.force_starttls &&
 	    pcontext->connection.ssl == nullptr)
 		return 520;
-	parse_mime_addr(&email_addr, buff);
+	EMAIL_ADDR email_addr(buff);
 	if (!email_addr.has_addr()) {
         /* 550 invalid user - <email_addr> */
 		smtp_reply_str = resource_get_smtp_code(516, 1, &string_length);
@@ -175,7 +174,6 @@ int smtp_cmd_handler_rcpt(const char* cmd_line, int line_length,
 	size_t string_length = 0;
     const char*smtp_reply_str, *smtp_reply_str2;
     char buff[1024], reason[1024], path[256];
-    EMAIL_ADDR email_addr;
 
 	if (line_length <= 8 || 0 != strncasecmp(cmd_line + 4, " TO:", 4))
         /* syntax error or arguments error*/
@@ -185,7 +183,7 @@ int smtp_cmd_handler_rcpt(const char* cmd_line, int line_length,
 		return 520;
     memcpy(buff, cmd_line + 8, line_length - 8);
     buff[line_length - 8] = '\0';
-	parse_mime_addr(&email_addr, buff);
+	EMAIL_ADDR email_addr(buff);
 	if (!email_addr.has_addr()) {
         /* 550 invalid user - <email_addr> */
 		smtp_reply_str = resource_get_smtp_code(516, 1, &string_length);

tests/utiltest.cpp

@@ -78,13 +78,11 @@ static int t_convert()
 
 static int t_emailaddr()
 {
-	EMAIL_ADDR em;
 	for (const auto s : {"[email protected]", "<[email protected]>", "\"[email protected]\"", "U D <[email protected]>",
 	     "\"U D\" <[email protected]>", "\"U\\\"D\" <[email protected]>",
 	     "=?utf-8?Q?=C3=A5 D?= <[email protected]>", "\"U D\"", "\"U D\" <>"}) {
 		printf("%s:\n", s);
-		em = {};
-		parse_mime_addr(&em, s);
+		EMAIL_ADDR em(s);
 		printf("\tmime: <%s> <%s> <%s>\n", em.display_name, em.local_part, em.domain);
 	}
 	return EXIT_SUCCESS;